Fix broken compilation on some hosts when using --as-needed (#152654).

Package-Manager: portage-2.1.1-r1

4 files changed, 32 insertions, 19 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 0a68da041442..9aded261d5e0 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.44 2006/10/22 20:03:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.45 2006/11/11 17:33:52 mrness Exp $
+
+  11 Nov 2006; Alin Nastac <mrness@gentoo.org> quagga-0.99.5.ebuild:
+  Fix broken compilation on some hosts when using --as-needed (#152654).
 
 *quagga-0.99.5 (22 Oct 2006)
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index e098ae8d830a..13fe149932f0 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bgpd.init 900 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 SHA1 4e7323c366c2bfe5287e132bf8e1e7f7e79b8e43 SHA256 0625c171ec51e58175dbb59892964b5958179374947755678b2c344d98222bac
 MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 files/bgpd.init 900
@@ -38,7 +41,7 @@ DIST quagga-0.98.6-patches-20060511.tar.gz 19251 RMD160 0c46dc9aac99a74871bf1252
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
 DIST quagga-0.99.4-patches-20060604.tar.gz 17857 RMD160 aa984a4b2d0b77b59976b356223bcec7f3e1715a SHA1 bc3a57d54ca9685b03634469e72b08f79c8ef1f2 SHA256 7704bc5ef78bd058b2e12e77f16df28e9cb8839f970a506df428395aabdebca6
 DIST quagga-0.99.4.tar.gz 2207774 RMD160 a0818323c7dc714ed9514cf3cb8110a891b2fa5d SHA1 eb5c12c6345e7651114c704dd3c945d0c7595c10 SHA256 4044bfacb44ec9fa9160b56aeb1e76e1ca62b17115ae38298065cbaad16491a7
-DIST quagga-0.99.5-patches-20061022.tar.gz 17661 RMD160 2880002fccf7fb961e35265e989bd8b518d8dc0a SHA1 409393bc1dd7b8c1eefa671452f40176fb710cfe SHA256 d29683a7bde96ac17f24187bdb841c613c3d96df8529d9835a9fa4fd6f3763cf
+DIST quagga-0.99.5-patches-20061111.tar.gz 17786 RMD160 a301713e724bd0190302858f1209b4e32abb0e5b SHA1 fa2afcb1bb0ca2bded17eefb14a734b8f5ecc3d4 SHA256 0be922ffe1fbdf420500f8c93c8ac08bf37af77e91171d2f1a4fa2cad279272b
 DIST quagga-0.99.5.tar.gz 2311140 RMD160 7e9237f12bd6105b91d79c5e22f6999234126b50 SHA1 ef20ca8b0d161a9cac1a232fa4a8c0db94b0d58d SHA256 2555535654893806d21e804406f2cf594214bb2b9661458eb5bbf00402c31c7b
 EBUILD quagga-0.98.6-r1.ebuild 5041 RMD160 8518ca70b3d194fca26e23bd801a2e8711e84153 SHA1 e209c6816a53e9e8e084075a7a0d2cfc4afd1cad SHA256 aaf5d0069ef7c07c5a403af8b45bb19cd03c99ed93900d953643825ae97286a1
 MD5 a1e5d119045561f906835d01ada0ced2 quagga-0.98.6-r1.ebuild 5041
@@ -48,14 +51,14 @@ EBUILD quagga-0.99.4.ebuild 3900 RMD160 07def80d0401c0949cf2cbbfaf1cd36a9d6c27fb
 MD5 fde64146439a21f03074e83eebbf3362 quagga-0.99.4.ebuild 3900
 RMD160 07def80d0401c0949cf2cbbfaf1cd36a9d6c27fb quagga-0.99.4.ebuild 3900
 SHA256 4c010301f427a8a56b99dc2a146ff8b0e98ac33216d52b5468ec29dfd6935eb0 quagga-0.99.4.ebuild 3900
-EBUILD quagga-0.99.5.ebuild 3900 RMD160 c4354f4ec6fb7bc539db13f049260dcea9330b58 SHA1 af31d00202a06fa45186f1a27e667a1bab5b901d SHA256 3541ed4dfefd021b273b1d65190117c4f858655baca68f77bd1d2e37be117ba1
-MD5 0dfb8934c07ee8d355970287d022c0d0 quagga-0.99.5.ebuild 3900
-RMD160 c4354f4ec6fb7bc539db13f049260dcea9330b58 quagga-0.99.5.ebuild 3900
-SHA256 3541ed4dfefd021b273b1d65190117c4f858655baca68f77bd1d2e37be117ba1 quagga-0.99.5.ebuild 3900
-MISC ChangeLog 12856 RMD160 3730d559d663ffb5cff24fb0fd47989d0414d7d4 SHA1 5212a9c77c6ef1cf43fa66f9cbccf6370bf7ac05 SHA256 f02ccd793d718f728d3bfa17b257f73e5c8ea2faa6fcb03b062c7eb7bdfd09a1
-MD5 859ace7cbca661cd795d7ebc7f2b0f63 ChangeLog 12856
-RMD160 3730d559d663ffb5cff24fb0fd47989d0414d7d4 ChangeLog 12856
-SHA256 f02ccd793d718f728d3bfa17b257f73e5c8ea2faa6fcb03b062c7eb7bdfd09a1 ChangeLog 12856
+EBUILD quagga-0.99.5.ebuild 3896 RMD160 0593eed67be6aefc54f86604ed0f29498bca6b0b SHA1 e81e3432a2f255758c248d596b0d0f828209e83e SHA256 d276362939e723d24ffe375d5c3424e74763e34550d494f370465ae034c4a46a
+MD5 9a75076aa910373bc7175473bf1d85bd quagga-0.99.5.ebuild 3896
+RMD160 0593eed67be6aefc54f86604ed0f29498bca6b0b quagga-0.99.5.ebuild 3896
+SHA256 d276362939e723d24ffe375d5c3424e74763e34550d494f370465ae034c4a46a quagga-0.99.5.ebuild 3896
+MISC ChangeLog 12999 RMD160 cb8db37a8335bb54fbbb21220b6e168a56dc9e2e SHA1 9a341a4b7cdde71fae927f993930e5f30eac7da5 SHA256 dbcf1c98c2a4e210f86ba2aae1f79efd9f7337cdad1247584d899f1549e59ddd
+MD5 cb888519ad0a7c624d65c94381ec7892 ChangeLog 12999
+RMD160 cb8db37a8335bb54fbbb21220b6e168a56dc9e2e ChangeLog 12999
+SHA256 dbcf1c98c2a4e210f86ba2aae1f79efd9f7337cdad1247584d899f1549e59ddd ChangeLog 12999
 MISC metadata.xml 1301 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa SHA1 0d1a07e1b3821ec910b98531511f51f733915a8d SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb
 MD5 558920a085e2065a8aef6eca3e1896fb metadata.xml 1301
 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa metadata.xml 1301
@@ -66,6 +69,13 @@ SHA256 16c8576b8842fd33e5545deed73e9d2c4a0a3530e8e9556b567695551a714716 files/di
 MD5 269d269a8fc489e2c0f2556e58dd85c1 files/digest-quagga-0.99.4 533
 RMD160 dd6b94dae942386978b3f399dd16cef29863bd81 files/digest-quagga-0.99.4 533
 SHA256 1b056c632d68c9ca9aec63591d48fcea27184c7342d2d0449b3490960be72078 files/digest-quagga-0.99.4 533
-MD5 66fe0023f2f5ed7e4fb076188b9ec578 files/digest-quagga-0.99.5 533
-RMD160 b3baee770fb81138065c38ff3c3fac41c17e4605 files/digest-quagga-0.99.5 533
-SHA256 4ba7c75d21a1da1146f145c5d21aeebfe94fc9d74da866125e5046d28066634f files/digest-quagga-0.99.5 533
+MD5 c13316f5837127e7515e0498d15984d4 files/digest-quagga-0.99.5 533
+RMD160 dcc9497638b2d6d071b741c45064f2ee01c73464 files/digest-quagga-0.99.5 533
+SHA256 0e6afbebd5de7159100db142acbc29bc46a59951b74cb414aad2764cce984972 files/digest-quagga-0.99.5 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFVgmR3sf9c6kjmR8RAuryAJsHfiFCBG4mT0z8yW/C1PPSER/GEgCeJ2pj
+15OBwEUvOJQXYjUoBNTH1Pk=
+=I9G6
+-----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/files/digest-quagga-0.99.5 b/net-misc/quagga/files/digest-quagga-0.99.5
index 2b1fb598fc16..f52d125b3758 100644
--- a/net-misc/quagga/files/digest-quagga-0.99.5
+++ b/net-misc/quagga/files/digest-quagga-0.99.5
@@ -1,6 +1,6 @@
-MD5 9d3a2e063b02cd3965d5f4c0c0db1f79 quagga-0.99.5-patches-20061022.tar.gz 17661
-RMD160 2880002fccf7fb961e35265e989bd8b518d8dc0a quagga-0.99.5-patches-20061022.tar.gz 17661
-SHA256 d29683a7bde96ac17f24187bdb841c613c3d96df8529d9835a9fa4fd6f3763cf quagga-0.99.5-patches-20061022.tar.gz 17661
+MD5 a5ff8d360fe733df38cf86c5d04090e8 quagga-0.99.5-patches-20061111.tar.gz 17786
+RMD160 a301713e724bd0190302858f1209b4e32abb0e5b quagga-0.99.5-patches-20061111.tar.gz 17786
+SHA256 0be922ffe1fbdf420500f8c93c8ac08bf37af77e91171d2f1a4fa2cad279272b quagga-0.99.5-patches-20061111.tar.gz 17786
 MD5 3f9c71aca6faa22a889e2f84ecfd0076 quagga-0.99.5.tar.gz 2311140
 RMD160 7e9237f12bd6105b91d79c5e22f6999234126b50 quagga-0.99.5.tar.gz 2311140
 SHA256 2555535654893806d21e804406f2cf594214bb2b9661458eb5bbf00402c31c7b quagga-0.99.5.tar.gz 2311140
diff --git a/net-misc/quagga/quagga-0.99.5.ebuild b/net-misc/quagga/quagga-0.99.5.ebuild
index ef6c8ffe851e..0052a4812239 100644
--- a/net-misc/quagga/quagga-0.99.5.ebuild
+++ b/net-misc/quagga/quagga-0.99.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.5.ebuild,v 1.1 2006/10/22 20:03:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.5.ebuild,v 1.2 2006/11/11 17:33:52 mrness Exp $
 
 inherit eutils multilib autotools
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
 HOMEPAGE="http://quagga.net/"
 SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20061022.tar.gz"
+	mirror://gentoo/${P}-patches-20061111.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,7 +25,7 @@ src_unpack() {
 	unpack ${A} || die "failed to unpack sources"
 
 	cd "${S}" || die "source dir not found"
-	epatch "${WORKDIR}/patch/${P}-zebra-linkorder.patch"
+	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
 
 	# TCP MD5 for BGP patch for Linux (RFC 2385) - http://hasso.linux.ee/doku.php/english:network:rfc2385
 	use tcpmd5 && epatch "${WORKDIR}/patch/ht-20050321-0.98.2-bgp-md5_adapted.patch"