Improve the patch for --as-needed. Closes bug #132659.

Package-Manager: portage-2.1_rc4-r1

4 files changed, 105 insertions, 9 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index fc31b79107af..63fccb70729d 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.135 2006/02/11 19:46:31 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.136 2006/06/04 16:06:40 flameeyes Exp $
+
+  04 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/net-snmp-5.2.2-asneeded.patch:
+  Improve the patch for --as-needed. Closes bug #132659.
 
 *net-snmp-5.2.2-r3 (11 Feb 2006)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index e43df474ddcd..4dbd827ee610 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,16 +1,74 @@
-MD5 1748f6ee78141612c12fef8f11a7d184 ChangeLog 22156
-MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2-r1 69
-MD5 92b7d3fe0c5dad9c215a170199e3c66c files/digest-net-snmp-5.2.2-r3 67
-MD5 d3cebd37f9a75b0968bd7a60fb68e7eb files/digest-net-snmp-5.3.0.1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734 RMD160 904d195cafa4334f9d8116a3d13eff4181e06d3b SHA1 0101a446e217a95f621e634544b19490fa01c072 SHA256 893180ba84ef69381d270286f042852a200c35b7792f55fe23920a0bcb1d8fb9
 MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
+RMD160 904d195cafa4334f9d8116a3d13eff4181e06d3b files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
+SHA256 893180ba84ef69381d270286f042852a200c35b7792f55fe23920a0bcb1d8fb9 files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
+AUX net-snmp-5.2.1-fix-insecure-fixproc.diff 1639 RMD160 05b1099c32c2091e9606f167288a21503510cc20 SHA1 278b48283e536bc76935865ec227c402019e7df6 SHA256 100f18794f11c0d0fe43e9f50cec755158906268b4c2b560f45f8d7ff797422e
 MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
-MD5 3e2ad4a80d670958106d3c97cac1a24f files/net-snmp-5.2.2-asneeded.patch 1458
+RMD160 05b1099c32c2091e9606f167288a21503510cc20 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
+SHA256 100f18794f11c0d0fe43e9f50cec755158906268b4c2b560f45f8d7ff797422e files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
+AUX net-snmp-5.2.2-asneeded.patch 3014 RMD160 4394ac08e2ab0a4c57036b61b554e1bdc7c29ff2 SHA1 9c2f1e4ac9ffab8f604740b47dce9914dd0200f6 SHA256 2caa3beb56a0087e1800d875988ceaf11da0ba1eb5121804f2827d4b53a682b7
+MD5 55644512ad20558e95bedce0d6476278 files/net-snmp-5.2.2-asneeded.patch 3014
+RMD160 4394ac08e2ab0a4c57036b61b554e1bdc7c29ff2 files/net-snmp-5.2.2-asneeded.patch 3014
+SHA256 2caa3beb56a0087e1800d875988ceaf11da0ba1eb5121804f2827d4b53a682b7 files/net-snmp-5.2.2-asneeded.patch 3014
+AUX net-snmp-5.2.2-conf-elf-rpm-bz2.patch 4815 RMD160 3b716cac3df53db19b2c4eb295a5fb8045f96125 SHA1 e23506ea9f27e82d796e5896158632cb93f0f8ac SHA256 7186744012f9afe8834366c96784d9088fd6f0c306c0fc65eb0e8bbdc8cdf338
 MD5 ca3a2ba5a12a796d29087038828f2c21 files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch 4815
+RMD160 3b716cac3df53db19b2c4eb295a5fb8045f96125 files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch 4815
+SHA256 7186744012f9afe8834366c96784d9088fd6f0c306c0fc65eb0e8bbdc8cdf338 files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch 4815
+AUX net-snmp-lm_sensors.patch 13686 RMD160 b2e67c6f5a5347442fbaa97c9ce209f1d9bed194 SHA1 3e795339fc93306a4d662feeaa16faca2509a058 SHA256 51dc2363a687d9f4e65b0a59e767b33129d07623a0b4da07b685e406d2576b86
 MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
+RMD160 b2e67c6f5a5347442fbaa97c9ce209f1d9bed194 files/net-snmp-lm_sensors.patch 13686
+SHA256 51dc2363a687d9f4e65b0a59e767b33129d07623a0b4da07b685e406d2576b86 files/net-snmp-lm_sensors.patch 13686
+AUX snmpd-5.1.conf 606 RMD160 a243da5c9dfde4a5cfb16bd7d4491cedb7879620 SHA1 5c7c45a434cb566cfec678050384f9ab6af912a9 SHA256 f569766eb6ca203a0c9549b2592d6f36ae4999cfaabc423cad5a864201a86ac9
 MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
+RMD160 a243da5c9dfde4a5cfb16bd7d4491cedb7879620 files/snmpd-5.1.conf 606
+SHA256 f569766eb6ca203a0c9549b2592d6f36ae4999cfaabc423cad5a864201a86ac9 files/snmpd-5.1.conf 606
+AUX snmpd-5.1.rc6 714 RMD160 1f7cef43888500044be0b0d4938574922b48bcfd SHA1 7468069b6e12b527f5a6a8026b67125f3545d243 SHA256 8f02a26a794a5c37e4cb4092ab61f82a6d7ec5876146738d4630ed147cc9ccf6
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
+RMD160 1f7cef43888500044be0b0d4938574922b48bcfd files/snmpd-5.1.rc6 714
+SHA256 8f02a26a794a5c37e4cb4092ab61f82a6d7ec5876146738d4630ed147cc9ccf6 files/snmpd-5.1.rc6 714
+AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d296caa01c789455c3cd4c67cd81aca5547681d SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3
 MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
-MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+RMD160 aba7b7196835bd359174156a527e13188f76e248 files/snmptrapd.conf 635
+SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3 files/snmptrapd.conf 635
+DIST net-snmp-5.2.1.2.tar.gz 3869893
+DIST net-snmp-5.2.2.tar.gz 3919826 RMD160 54c0bcc34ca6462aaab9ba69b06955dd7c11670f SHA1 2c45d24c5784b8b469e9ba3fde9eeeeabbcb7ab0 SHA256 ed5cc617e4cfe38af64a3ded8542c4e61d045dbeec00d5b93a31afc3337135fd
+DIST net-snmp-5.3.0.1.tar.gz 4183370
+EBUILD net-snmp-5.2.1.2-r1.ebuild 5091 RMD160 f16dbbee4a8df3335c9b44b5c20a6d241c717e43 SHA1 0598ae87694795c1b4fec4847e37dff44b342318 SHA256 782c84363e0035fcecdc534daaf475d57d13afe6a49c420cd31de3a2584d1ddf
 MD5 80cb809de03b99eab3c98bd4f37aacbe net-snmp-5.2.1.2-r1.ebuild 5091
+RMD160 f16dbbee4a8df3335c9b44b5c20a6d241c717e43 net-snmp-5.2.1.2-r1.ebuild 5091
+SHA256 782c84363e0035fcecdc534daaf475d57d13afe6a49c420cd31de3a2584d1ddf net-snmp-5.2.1.2-r1.ebuild 5091
+EBUILD net-snmp-5.2.2-r3.ebuild 5392 RMD160 9337808ed3b461ecccde0b49bec54895af967534 SHA1 a14ea9033d98bdd57bf4660e1a4599f3feda506e SHA256 cafdcd78a24107cd47aec7db8f290b4edd9e35c59f620a70d6d7b8968ac2d216
 MD5 c911908ccabc37b092ba628918044013 net-snmp-5.2.2-r3.ebuild 5392
+RMD160 9337808ed3b461ecccde0b49bec54895af967534 net-snmp-5.2.2-r3.ebuild 5392
+SHA256 cafdcd78a24107cd47aec7db8f290b4edd9e35c59f620a70d6d7b8968ac2d216 net-snmp-5.2.2-r3.ebuild 5392
+EBUILD net-snmp-5.3.0.1.ebuild 5505 RMD160 7fc4965eada8b3645e07c35ff1218c53dad2d979 SHA1 c8ec4c4c548d46b4224eb0c67ef6faffe737f968 SHA256 0e20f6cc9d7e38e3f196cdc75acfb90d4f37d460315fb18c44553fd37836195c
 MD5 506eb799fdc796b9eb13bc67145f8cee net-snmp-5.3.0.1.ebuild 5505
+RMD160 7fc4965eada8b3645e07c35ff1218c53dad2d979 net-snmp-5.3.0.1.ebuild 5505
+SHA256 0e20f6cc9d7e38e3f196cdc75acfb90d4f37d460315fb18c44553fd37836195c net-snmp-5.3.0.1.ebuild 5505
+MISC ChangeLog 22305 RMD160 a6aa6949c8e8773620a32620c8b2a1af447781bd SHA1 00789f140e8f3207131dbb192fefa7c6e44b0e89 SHA256 74ecd2beb8a4539b16070514eb2611e185ccc7fb0e5f782f5bf3a79b4dc9f4f3
+MD5 77c6b9cdece44565809b3e460b0d730e ChangeLog 22305
+RMD160 a6aa6949c8e8773620a32620c8b2a1af447781bd ChangeLog 22305
+SHA256 74ecd2beb8a4539b16070514eb2611e185ccc7fb0e5f782f5bf3a79b4dc9f4f3 ChangeLog 22305
+MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b
+MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 metadata.xml 160
+SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b metadata.xml 160
+MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2-r1 69
+RMD160 a076b089f94dca1bf3f17319b202b88694fe8777 files/digest-net-snmp-5.2.1.2-r1 69
+SHA256 a4fcd91f71f244fcad7a5ce569b39756e2e7df65431699ca267f612f33bbc861 files/digest-net-snmp-5.2.1.2-r1 69
+MD5 31a617d8717329eaab7e2e4e998da3ad files/digest-net-snmp-5.2.2-r3 247
+RMD160 84d045de83961306e7908bfdff02665fe6ebb9c0 files/digest-net-snmp-5.2.2-r3 247
+SHA256 8082447b2cf48c79d578b97f7a2773a06fa5e0810dc6329849e5030090508647 files/digest-net-snmp-5.2.2-r3 247
+MD5 d3cebd37f9a75b0968bd7a60fb68e7eb files/digest-net-snmp-5.3.0.1 69
+RMD160 3af61ce289bac38d223f56234ebf8be9e0bceb22 files/digest-net-snmp-5.3.0.1 69
+SHA256 3f8af1549b44c40f31793214b995359339a3e34263c436ccbc60aaaff3b73141 files/digest-net-snmp-5.3.0.1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEgwUdAiZjviIA2XgRAlVqAKDVGF8+iOuGcHDYhFKjCmR92Zr61gCgz0rz
+YgBPOedD6CzYzoSTyk+ZV94=
+=BBhy
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2-r3 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2-r3
index 0cbebdac5c7a..646091cbe46d 100644
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2-r3
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2-r3
@@ -1 +1,3 @@
 MD5 2d9cdf956d6be5c5fcf2f898b403389b net-snmp-5.2.2.tar.gz 3919826
+RMD160 54c0bcc34ca6462aaab9ba69b06955dd7c11670f net-snmp-5.2.2.tar.gz 3919826
+SHA256 ed5cc617e4cfe38af64a3ded8542c4e61d045dbeec00d5b93a31afc3337135fd net-snmp-5.2.2.tar.gz 3919826
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.2-asneeded.patch b/net-analyzer/net-snmp/files/net-snmp-5.2.2-asneeded.patch
index d84c58ebdf9a..12af501d6602 100644
--- a/net-analyzer/net-snmp/files/net-snmp-5.2.2-asneeded.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.2.2-asneeded.patch
@@ -20,7 +20,21 @@ Index: net-snmp-5.2.2/configure.in
 ===================================================================
 --- net-snmp-5.2.2.orig/configure.in
 +++ net-snmp-5.2.2/configure.in
-@@ -2671,6 +2671,7 @@ if test "x$useopenssl" != "xno" ; then
+@@ -2362,11 +2362,12 @@ if test $? -eq 0 ; then
+         *)
+             AC_CHECK_HEADER(sensors/sensors.h,,
+                 [AC_MSG_ERROR([asked to use lm_sensors but I couldn't find sensors/sensors.h])])
+-            AC_CHECK_LIB(sensors, sensors_get_detected_chips, LIBS="${LIBS} -lsensors",
++            AC_CHECK_LIB(sensors, sensors_get_detected_chips, SENSORLIBS="-lsensors",
+                 [AC_MSG_ERROR([asked to use lm_sensors but I couldn't find -lsensors])])
+             ;;
+         esac
+ fi
++AC_SUBST(SENSORLIBS)
+ 
+ #
+ # Install the various perl modules
+@@ -2691,6 +2692,7 @@ if test "x$useopenssl" != "xno" ; then
          encrmodes="[disabled]"
      fi
      AC_DEFINE(USE_OPENSSL)
@@ -28,7 +42,7 @@ Index: net-snmp-5.2.2/configure.in
      AC_MSG_RESULT(OpenSSL Support)
  elif test "x$usepkcs" != "xno" ; then
      authmodes="MD5 SHA1"
-@@ -2690,6 +2691,7 @@ fi
+@@ -2710,6 +2712,7 @@ fi
  if test "x$enable_md5" = "xno"; then
      authmodes=`echo $authmodes | sed 's/MD5 *//;'`
  fi
@@ -36,3 +50,21 @@ Index: net-snmp-5.2.2/configure.in
  
  AC_MSG_CACHE_ADD(Authentication support:     $authmodes)
  AC_MSG_CACHE_ADD(Encryption support:         $encrmodes)
+Index: net-snmp-5.2.2/agent/Makefile.in
+===================================================================
+--- net-snmp-5.2.2.orig/agent/Makefile.in
++++ net-snmp-5.2.2/agent/Makefile.in
+@@ -130,11 +130,11 @@ snmpd$(EXEEXT):	${LAGENTOBJS} $(USELIBS)
+ 
+ 
+ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+-	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS)
++	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS) helpers/libnetsnmphelpers.la
+ 	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
+-	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS)
++	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) @SENSORLIBS@
+ 	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+ embedperlinstall: