Fix toolchain quadruplet detection (bug #330353).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 24 insertions, 4 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 7e4fd295df63..444af49abfdc 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.214 2010/07/13 22:08:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.215 2010/08/04 01:38:02 jer Exp $
+
+  04 Aug 2010; Jeroen Roovers <jer@gentoo.org> net-snmp-5.4.2.1-r4.ebuild,
+  +files/net-snmp-5.4.2.1-perlcc-hppa.patch:
+  Fix toolchain quadruplet detection (bug #330353).
 
   13 Jul 2010; Jeroen Roovers <jer@gentoo.org> net-snmp-5.5.ebuild:
   Remove unneeded autotools eclass.
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 82a728f1a8f9..a316bc573b9f 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -2,6 +2,7 @@ AUX CVE-2008-6123.patch 867 RMD160 1e8b6521ae0955681493c1ba594eb0344183e147 SHA1
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 RMD160 c78fd9d2a563ebafd21aa85a582b989a805eb645 SHA1 159990e855cfeb50ac3657d1b97eda181d4ffb9e SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874
 AUX net-snmp-5.4.1-sensors3-version_detect.patch 1391 RMD160 eba5c1cba2fc5d0484143eb4b41f656f5f72bee4 SHA1 8c8ebcc9e4725e91cc7b07cdd45cbcf6e2ed806e SHA256 e18f7bd358c4f587793f9e9250489200d2708b50529dfe222f04b71617fa1e59
 AUX net-snmp-5.4.1-sensors3.patch 48401 RMD160 9899c587eb252cf9edac758133a420ef0307c315 SHA1 cd5adc2fab5c1d58c8a318d34aa3fcd4fd25c455 SHA256 e74e06a5f23350a2851fdc9f419335767d898ec66dd809e1c0413e39034d6f53
+AUX net-snmp-5.4.2.1-perlcc-hppa.patch 644 RMD160 4200893069839a8168dc706c1d940a029e975f02 SHA1 118157050c5c0cfbdb5aeb08dc3f5f020c0ccd5e SHA256 54f3fdd3b62ee8ceca1bd61c4db4bca075619afc958d04ded6178380785a2fec
 AUX snmpd.conf 598 RMD160 c72a20fe6d4682ceea533587762782d62906b630 SHA1 51ebdca93c68ca04b7f402fad4f504422ec2c6cf SHA256 1f4f07b831c3227588fd546423137ed5c60a602fbee13b0d66edd801e4e7d598
 AUX snmpd.init 1054 RMD160 6cc814d19524e1899b4bb9539ee9752304451bc9 SHA1 ed2b1a4bd7da84ca6294c0df66cace2e7c0ffe72 SHA256 824ae327db4d76fe4cdc882f06ac989e510ee1ee96c90137ab84bc18446ba8b6
 AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d296caa01c789455c3cd4c67cd81aca5547681d SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3
@@ -10,8 +11,8 @@ DIST net-snmp-5.4.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e
 DIST net-snmp-5.4.3.tar.gz 5199202 RMD160 417f47c301c3221a64f37162b56b4661c9f6d8cb SHA1 849a20ddeaa90b1b0010e487876927e615b5c6bc SHA256 461a7a72acbe5ad13e39f0bae129b49df541b8ea8f9178d2724de7654d4f1c40
 DIST net-snmp-5.5.tar.gz 5531055 RMD160 1699d9cb6bcd5075a565cc8af9913be4dfbc49e2 SHA1 ca03ece79b218af081ee4b273da4e217f459e508 SHA256 95936c6a95bef929e7ae0d9144c3fa20ffe62291dff94835bde88c5b5d2bf347
 EBUILD net-snmp-5.4.2.1-r1.ebuild 5379 RMD160 e40be09d8708039178f7f6c38e2552d2962cdfc5 SHA1 117898fecd0dea9a83e97656ca402ac069d7c79c SHA256 444a411dc6592aa16b789c499d44b63bddd52dee655c73449300c02b90f166d0
-EBUILD net-snmp-5.4.2.1-r4.ebuild 5808 RMD160 cb0a9ba6286d2f615f171c521a52b17101b18655 SHA1 93b3125e00949ea63e4cbbff65afcab9f53bbacd SHA256 1be0dd43ad87765976513b478c0fb18cdb94fe564473dc97e8b376e8eeb9562e
+EBUILD net-snmp-5.4.2.1-r4.ebuild 5906 RMD160 4ac367a96eb481c0452b4971a1b7c5251ab876df SHA1 d9754dd9d042d3a923172652c2dd236da303e545 SHA256 854abe07556b820fd3ae04b59fdf6a28f4159aa6c2250da29daab2abd2adc448
 EBUILD net-snmp-5.4.3.ebuild 5905 RMD160 0bd7361681db767061b9e159335868a04f5835c6 SHA1 8e1018de8bb052e4901f6be74e63e34ffe3dad77 SHA256 28a036a02156f01dc231711953e726d33ff00b0ba17c713b5053c0aafb21a618
 EBUILD net-snmp-5.5.ebuild 5570 RMD160 d722afb0741b78f6523f66c5bf7e3f83c4ce65a0 SHA1 f05d4f854dde95a9c1f71c7bae67d388b5592810 SHA256 f4b568035391a7e8c95a89a5948f7ed6850a12aaa9670df6636182676723d87a
-MISC ChangeLog 35532 RMD160 66037fe4617e13d16e428d3a2e6087141322f998 SHA1 91cb21de854091c15b66969d9f1a9b339301eca5 SHA256 44d2e0bbf3e7cf1a94c71978783ecb21b2adc88b08649d5e83976c53df0777a3
+MISC ChangeLog 35705 RMD160 e93dd8f86ce65b7b12324a5d7243f542109ea6fa SHA1 067959c72a41db68a82a363618930233422ab7ff SHA256 1b60252fa389f2d961f9cc5dedf8af5f4f8c83f2f890243f816542cf3284d3a5
 MISC metadata.xml 675 RMD160 3785784fde686fec578c82814a96f295e64c800b SHA1 433d32bd2e67c60324ad401a1b3eeb6b908656d2 SHA256 ed42873349256bf59c84251b140b22c5323a2d3d359fec89217ba50f8cecd9c4
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.4.2.1-perlcc-hppa.patch b/net-analyzer/net-snmp/files/net-snmp-5.4.2.1-perlcc-hppa.patch
new file mode 100644
index 000000000000..40a0d1bbe7f3
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.2.1-perlcc-hppa.patch
@@ -0,0 +1,12 @@
+diff -uNr net-snmp-5.4.2.1.orig/configure.in net-snmp-5.4.2.1/configure.in
+--- net-snmp-5.4.2.1.orig/configure.in	2010-07-29 12:05:12.619347954 +0200
++++ net-snmp-5.4.2.1/configure.in	2010-07-29 12:05:38.358857068 +0200
+@@ -2986,7 +2986,7 @@
+     if test "xenable_perl_cc_checks" != "xno" ; then
+       AC_MSG_CHECKING([for Perl cc])
+       changequote(, )
+-      PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'`
++      PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/\.]+).;\s*/$1/);'`
+       changequote([, ])
+       if test "x$PERLCC" != "x" ; then
+         AC_MSG_RESULT([$PERLCC])
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild
index 3805f721ef56..f4d4bf8c62b4 100644
--- a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild,v 1.8 2010/07/12 19:56:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild,v 1.9 2010/08/04 01:38:02 jer Exp $
 
 EAPI=2
 
@@ -77,6 +77,9 @@ src_prepare() {
 	# Fix version number:
 	sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" \
 		snmplib/snmp_version.c || die "sedding version failed"
+	
+	# Fix toolchain quadruplet detection, bug #330353
+	epatch "${FILESDIR}/${P}-perlcc-hppa.patch"
 
 	eautoreconf