Migrate to EAPI 2.

Correct configure arguments.
Include upstream fix for ASN values bigger than 2^31 (#267998).
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 122 insertions, 5 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 908d40cad92f..9d2600b2b2ed 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,13 @@
 # Copyright 1999-2009 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.79 2009/03/07 14:11:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.80 2009/05/02 09:37:52 mrness Exp $
+
+*quagga-0.99.11-r1 (02 May 2009)
+
+  02 May 2009; Alin Năstac <mrness@gentoo.org> +quagga-0.99.11-r1.ebuild:
+  Migrate to EAPI 2. Correct configure arguments. Include upstream fix for ASN
+  values bigger than 2^31 (#267998).
 
   07 Mar 2009; Alin Năstac <mrness@gentoo.org> -quagga-0.99.10-r1.ebuild:
   Remove obsolete test version.
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 1c61579464fc..52995ff235ea 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -13,15 +13,17 @@ AUX zebra.init 1013 RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 SHA1 462d7e2
 DIST quagga-0.98.6-patches-20080708.tar.gz 21295 RMD160 d88c25bcc8e96e9b101638c1faf99cdad61baaa3 SHA1 24226a1a5b305b1e8b983831366eb65f81da090f SHA256 7b6dca8f58cb3f54a76a4d02c63505fa60b9554e03a58b8b9674f90b63dcefbe
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
 DIST quagga-0.99.11-patches-20081013.tar.gz 13243 RMD160 6f0d4cc46e6c4a6de1037b77e23a73c60f3411d9 SHA1 1baca76f8448d10e8d205dc24a4a6dd0cafd9989 SHA256 6082cec0a844c921e414ef7883fb7fb363a4585674779fd47dd6063f9c590228
+DIST quagga-0.99.11-patches-20090502.tar.gz 18188 RMD160 155eb8d39d5964895f79b2d1fc317410f9ec0b96 SHA1 acb7ad573f066eddd1924f5f64968931645d404f SHA256 581b8aafdba4091c039b90c57940ae2c310c03d54559260f71acc704669d7c80
 DIST quagga-0.99.11.tar.gz 2192249 RMD160 654107378955c24c50730c4c9e7544a163bc33b8 SHA1 6542aab6b558cb88ac0806cce10b33be0f00ca27 SHA256 a83a357d6de23d7062360ca931371d2d65c0e1a2ba11c57c7a35c6e36b47a646
 EBUILD quagga-0.98.6-r4.ebuild 5384 RMD160 b13750f47c0e0452958a57de6e8547b493ef8a7f SHA1 76504c11179ec546161a2da58ddd884a48b27628 SHA256 f156a7931080ee9d9f0ad8dd4322144e9e2db780b072ae6e2820f51eff393d2c
+EBUILD quagga-0.99.11-r1.ebuild 3548 RMD160 307f2aced85024e1619832171d597c837bb8dab5 SHA1 5a62ba873d2bdafc16cc51bc9a985d46258bfeb5 SHA256 6d0f36fb86b50a844d6cdc107d593405e84c5367a25fb2ef12d583a176353674
 EBUILD quagga-0.99.11.ebuild 3585 RMD160 f5773e7bbc2c88531c3f838c39f8da62ce7cea03 SHA1 bc29ad20745dd7cff16abd633722fc70a121a1fb SHA256 2e76b764f719e7efe4ed1125aba607e5624514d4dfbf791f9fc509a65073e138
-MISC ChangeLog 17902 RMD160 7891e95587b9cfa1c9a24abf3336756f62823add SHA1 d3f90d2740e8ca69ebf6b22c42670bc8d7205b46 SHA256 14c9ea102f4fa1b821f62e6081e3fbf990857411f8a57f381eb43781673c9aca
+MISC ChangeLog 18128 RMD160 c216b46f9307c5ef90e57f5a45ecbfb548cebb5f SHA1 a2f987ee6973ebd5443171faf318843d4a946b71 SHA256 e966146df0e51dd2610390db18a24ae7aa28dba246b6ce548a938a2648d48526
 MISC metadata.xml 2073 RMD160 99bbbceb932054aa49aaf09566c1ba0ab7acc216 SHA1 bea36155bab6b90d49ed782be2670733c245e4fc SHA256 0c4297ffd73ddc23d96ff5f0a34f1ac45daf4d22367572ef2466312387c62406
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmygK8ACgkQts85UDFmaOWPuQCePoX+H3kDb8bAyF8ncAzPTepv
-tJgAn2jGuwmzPHMBshKrc/+IAZxL6hHA
-=I3B9
+iEYEARECAAYFAkn8FHsACgkQts85UDFmaOXY9gCfXJHBj0IkYiGrKDcKDH+L0caN
+oeoAn2+DrhDH1xaA3zcFC1JBGHuZ6uK6
+=x60X
 -----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/quagga-0.99.11-r1.ebuild b/net-misc/quagga/quagga-0.99.11-r1.ebuild
new file mode 100644
index 000000000000..f9b2e501ef13
--- /dev/null
+++ b/net-misc/quagga/quagga-0.99.11-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.11-r1.ebuild,v 1.1 2009/05/02 09:37:52 mrness Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils multilib autotools
+
+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
+	mirror://gentoo/${P}-patches-20090502.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+IUSE="caps ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra"
+RESTRICT="userpriv"
+
+DEPEND="sys-libs/readline
+	caps? ( sys-libs/libcap )
+	snmp? ( net-analyzer/net-snmp )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	sys-apps/iproute2"
+
+src_prepare() {
+	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
+	epatch "${WORKDIR}/patch/${P}-ipv6.patch"
+	epatch "${WORKDIR}/patch/${P}-ASN-fixes.patch"
+
+	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
+
+	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
+	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-static \
+		$(use_enable caps capabilities) \
+		$(use_enable snmp) \
+		$(use_with pam libpam) \
+		$(use_enable tcp-zebra)"
+	use ipv6 \
+			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
+			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
+	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 \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-cflags="${CFLAGS}" \
+		--enable-vtysh \
+		--sysconfdir=/etc/quagga \
+		--enable-exampledir=/etc/quagga/samples \
+		--localstatedir=/var/run/quagga \
+		--libdir=/usr/$(get_libdir)/quagga \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_install() {
+	einstall \
+		localstatedir="${D}/var/run/quagga" \
+		sysconfdir="${D}/etc/quagga" \
+		exampledir="${D}/etc/quagga/samples" \
+		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
+
+	dodir /var/run/quagga || die "failed to install /var/run/quagga"
+
+	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
+	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
+	for i in ${MY_SERVICES_LIST} ; do
+		newinitd "${FILESDIR}/${i}.init" ${i} || die "failed to install ${i} init.d script"
+	done
+	newconfd "${FILESDIR}/zebra.conf" zebra || die "failed to install zebra conf.d script"
+
+	if use pam; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/quagga.pam" quagga || die "failed to install pam.d file"
+	fi
+
+	newenvd "${FILESDIR}/quagga.env" 99quagga || die "failed to install env file"
+}
+
+pkg_preinst() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+pkg_postinst() {
+	# empty dir for pid files for the new priv separation auth
+	#set proper owner/group/perms even if dir already existed
+	install -d -m0770 -o root -g quagga "${ROOT}/etc/quagga"
+	install -d -m0755 -o quagga -g quagga "${ROOT}/var/run/quagga"
+
+	einfo "Sample configuration files can be found in /etc/quagga/samples."
+	einfo "You have to create config files in /etc/quagga before"
+	einfo "starting one of the daemons."
+}