Drop realms patch (failed to apply this time as well), add backports with fix for opaque-lsa (USE=ospfapi).

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

3 files changed, 25 insertions, 20 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 7bdadd155ff6..1d553553b990 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/quagga
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.103 2011/03/21 16:27:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.104 2011/03/22 17:06:23 flameeyes Exp $
+
+  22 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> quagga-0.99.18.ebuild:
+  Drop realms patch (failed to apply this time as well), add backports with fix
+  for opaque-lsa (USE=ospfapi).
 
 *quagga-0.99.18 (21 Mar 2011)
 
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index d81c3a4416eb..817111a7f55d 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -8,15 +8,16 @@ AUX zebra.init.2 1368 RMD160 d08432138577f2b7870d7a439a9a86698cf858f7 SHA1 8d5ff
 DIST ht-20040304-classless-bgp.patch 1581 RMD160 e08f18b725d2f899f0c4abe7df37dc6608e88baf SHA1 5216bfbcb0f0c42846d56afe7ab778895197a039 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887
 DIST quagga-0.99.14-realms-test2-gentoo.patch.bz2 10644 RMD160 3a709594e0c884a7a0b2efd3dee0f48fe34b27c8 SHA1 087b45666159470c7d4ca2976db58291a1b52ba3 SHA256 d501d3af061a001cef3698caff58c313872c0fbce55aa869b6e36377443c2e33
 DIST quagga-0.99.17.tar.gz 2202151 RMD160 f00bf01930f781ae0de9fe9981c74e7bae0798b5 SHA1 31f42fa9f4d96aadf1bf97c3d9bf3308eb0d56c1 SHA256 1d77df121a334e9504b45e489ee7ce35bf478e27d33cd2793a23280b59d9efd4
+DIST quagga-0.99.18-backports-1.tar.bz2 3333 RMD160 1dc58d65ab7a66dd50f056d376b4d033a57c8f69 SHA1 ceb744e8e46507ecfdf64d0cbed7095f157ed7e4 SHA256 6fac7e2351e3dba7d06e2b4afa6b9c4cf86de8f3553fb739a69ba3a5d503d6d7
 DIST quagga-0.99.18.tar.gz 2199014 RMD160 8c13de87ec9b73b4897e4387a7faebdbcb6cb826 SHA1 3486a8452212515f429dfae2cad5ed541b3d88d8 SHA256 0cdbe4b90075f4997ca6ecc71ef683a07b4a8ca3c718080fe83f4bcadbcc4d93
 EBUILD quagga-0.99.17-r2.ebuild 3503 RMD160 ec2e3a89903f0cbe41ec04080522fdbb6df06697 SHA1 fd327e5e3f7ba7fc548ea280578cec0d712ba526 SHA256 0087196e974c5a5425af98656e42473b5f9f7a1a08f20b8bdd85b931c492e8a2
-EBUILD quagga-0.99.18.ebuild 3572 RMD160 0d110b215ebcf82e95b6eddd57da84a43bdb1236 SHA1 fd9b431abc822303eec861695ff40086b868fba8 SHA256 7caa5d0a8c76f56cb9aefc654b978b55844e6145fec69023bbd27ab170f0895f
-MISC ChangeLog 18058 RMD160 4fcf1557506e399aed0f9e2639b1072361471207 SHA1 7a0e858a6df5579b8a5bc8071d3d42c2074ac13c SHA256 bddec0e642133151026b9a56eef2992fcba9b6ac127585594f64f36ddf71865e
+EBUILD quagga-0.99.18.ebuild 3481 RMD160 0dcf1147aaecd28d7239780c21f80a71ef5545f0 SHA1 fe1bfb46432c09892072d69919612ed5fb77b997 SHA256 d72ff9a53bcb84a0ff81f9e0427ec5b0a3f20ee533da520907c9eac3493dbe3a
+MISC ChangeLog 18250 RMD160 51018abd3dceab4ea8f50c39aa91478559207e1d SHA1 b8abcfd98413018f9af746d25befe772e4a1fc1a SHA256 1ec03a5fd71fefe5fa8a9637bc7f2b73c6f9f7b96e4083ebdbf75bc200b25992
 MISC metadata.xml 2577 RMD160 c2d0cf38a9f6381d07cb8da14084d44c81c88941 SHA1 e02360db7c6f7284e57baa1355750b3fe43bf3c7 SHA256 bfcacc88fd4c925d20241afcb9fb65f336cab5dfd81920d5f6aef32379005474
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2HfFQACgkQAiZjviIA2XiKXACbBu6v8olkEwVy0lXJBYbc7T/2
-EG8An2deHvkXM0pfWaQBeOOEsF0O7PSg
-=eS7G
+iEYEARECAAYFAk2I1woACgkQAiZjviIA2Xhj+QCcDKsG727abAOlXn0qAqh4RnmQ
+3NwAoJHQNmy6N6Ek2pYdndGBMoSOnGrB
+=U0lU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/quagga-0.99.18.ebuild b/net-misc/quagga/quagga-0.99.18.ebuild
index 516d28221656..3f7e8ae7e0bb 100644
--- a/net-misc/quagga/quagga-0.99.18.ebuild
+++ b/net-misc/quagga/quagga-0.99.18.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.18.ebuild,v 1.1 2011/03/21 16:27:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.18.ebuild,v 1.2 2011/03/22 17:06:23 flameeyes Exp $
 
 EAPI="2"
 
 CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
-#REALMS_PATCH=quagga-0.99.14-realms-test2.diff
-REALMS_PATCH=quagga-0.99.14-realms-test2-gentoo.patch.bz2
+
+BACKPORTS=1
 
 inherit eutils multilib autotools pam
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 HOMEPAGE="http://quagga.net/"
 SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )
-	realms? ( http://dev.gentoo.org/~flameeyes/patches/${PN}/${REALMS_PATCH} )"
-#	realms? ( http://linux.mantech.ro/download/quagga/${REALMS_PATCH} )
+	${BACKPORTS:+
+		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="caps doc ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra elibc_glibc +readline"
+IUSE="caps doc ipv6 snmp pam bgpclassless ospfapi multipath tcp-zebra elibc_glibc +readline"
 
 COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
@@ -41,17 +41,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.99.17-gentoo.patch"
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
 
 	# Classless prefixes for BGP
 	# http://hasso.linux.ee/doku.php/english:network:quagga
 	use bgpclassless && epatch "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
 
-	# Realms support (Calin Velea)
-	# http://vcalinus.gemenii.ro/quaggarealms.html
-	# http://linux.mantech.ro/quagga+realm_en.php
-	use realms && epatch "${DISTDIR}/${REALMS_PATCH}"
-
 	eautoreconf
 }
 
@@ -61,7 +58,6 @@ src_configure() {
 	use ospfapi \
 			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
 
-	use realms && myconf="${myconf} --enable-realms"
 	use multipath && myconf="${myconf} --enable-multipath=0"
 
 	econf \
@@ -120,4 +116,8 @@ pkg_postinst() {
 	elog ""
 	elog "You can pass additional options to the daemon by setting the EXTRA_OPTS"
 	elog "variable in their respective file in /etc/conf.d"
+	elog ""
+	elog "Starting from version 0.99.18, quagga no longer supports the realms patch."
+	elog "The patch was abandoned upstream and once again didn't apply; it needs a"
+	elog "dedicated maintainer, if it is still necessary."
 }