Fixed zebra link order (#135529)

(Portage version: 2.0.54-r2)

4 files changed, 11 insertions, 16 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 284db7527952..1ab21cb440c6 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,11 @@
 # 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.40 2006/05/23 21:23:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.41 2006/06/04 21:51:28 mrness Exp $
+
+  04 Jun 2006; Alin Nastac <mrness@gentoo.org> quagga-0.99.4.ebuild:
+  Fixed zebra link order. Original order caused build failure on a uclibc
+  based system (#135529).
 
 *quagga-0.99.4 (23 May 2006)
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 879e3cd0a7d9..3eb8b437bdfb 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 04f07636713e29463f1ebb0b671d5810 ChangeLog 12356
 MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
 MD5 fd0be646cb5258a11bb1a1ab1c29435d files/digest-quagga-0.98.6-r1 533
-MD5 77c8c901552ef06c9b489ee13abbea33 files/digest-quagga-0.99.4 147
+MD5 d870e8f898d9db580d10ab28faf635cf files/digest-quagga-0.99.4 147
 MD5 44547b687343ebfed7524cebc5626067 files/ospf6d.init 919
 MD5 89b0cf4e70172bfcd195b2869cae28da files/ospfd.init 910
 MD5 18c1046db57ea850aabd385058522cc4 files/quagga.env 25
@@ -15,11 +12,4 @@ MD5 c38e884372406e9e59616e436cd26388 files/zebra.conf 371
 MD5 2c1c5b782f96a74b48ccc496ad7a3865 files/zebra.init 1168
 MD5 f0c8f9afaf3bbefcea71ff3b6fa139c4 metadata.xml 1389
 MD5 2d6e00fd6afc86de74f979ab2703399e quagga-0.98.6-r1.ebuild 5196
-MD5 0635e84e22ec1c0c9dcf984b26de270a quagga-0.99.4.ebuild 3827
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEc315jG8pv1lIUX4RAnkOAKCwnWG+hA3zB7bFKkb8qD27qNhUqgCfeqG4
-E6Z0uzolYgnGRCt4AWOBuJs=
-=tdNY
------END PGP SIGNATURE-----
+MD5 dc8fe5b9d40bf72b74770f96b01dda70 quagga-0.99.4.ebuild 3881
diff --git a/net-misc/quagga/files/digest-quagga-0.99.4 b/net-misc/quagga/files/digest-quagga-0.99.4
index 9ba4221dbb3a..7d200b3df1b1 100644
--- a/net-misc/quagga/files/digest-quagga-0.99.4
+++ b/net-misc/quagga/files/digest-quagga-0.99.4
@@ -1,2 +1,2 @@
-MD5 d28e0fa45ae762f4b5317eb13cc9a0c2 quagga-0.99.4-patches-20060523.tar.gz 17529
+MD5 8fac5084e6388539e2fc8b8518b3fc65 quagga-0.99.4-patches-20060604.tar.gz 17857
 MD5 a75d3f5ed0b3354274c28d195e3f6479 quagga-0.99.4.tar.gz 2207774
diff --git a/net-misc/quagga/quagga-0.99.4.ebuild b/net-misc/quagga/quagga-0.99.4.ebuild
index c3a61aa88838..d64da6ad7f0b 100644
--- a/net-misc/quagga/quagga-0.99.4.ebuild
+++ b/net-misc/quagga/quagga-0.99.4.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.4.ebuild,v 1.1 2006/05/23 21:23:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.4.ebuild,v 1.2 2006/06/04 21:51:28 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-20060523.tar.gz"
+	mirror://gentoo/${P}-patches-20060604.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,6 +24,7 @@ src_unpack() {
 	unpack ${A} || die "failed to unpack sources"
 
 	cd "${S}" || die "source dir not found"
+	epatch "${WORKDIR}/patch/${P}-zebra-linkorder.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"