Version bump, wrt bug #464156. Assign myself as maintainer, fix whitespaces in metadata

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 185 insertions, 43 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 0c9577b24b06..a1367c4a2045 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/quagga
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.145 2012/12/22 15:20:38 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.146 2013/04/02 16:32:48 pinkbyte Exp $
+
+*quagga-0.99.22 (02 Apr 2013)
+
+  02 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> +quagga-0.99.22.ebuild,
+  metadata.xml:
+  Version bump, wrt bug #464156. Assign myself as maintainer, fix whitespaces
+  in metadata
 
   22 Dec 2012; Agostino Sarubbo <ago@gentoo.org> quagga-0.99.21.ebuild:
   Stable for ppc, wrt bug #408507
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index a0d892b6959f..07fadc752249 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX quagga-0.99.21-fix-no-ipv6.patch 3144 SHA256 905478424846456138fa194fee40ffd773d58ee0c68424fc0f5b986abfd0044e SHA512 8d05e60c980b207dd4a0e59f8bc95f687e16c521a41aeda542beb68ae23bc0e4f416c46521d902b188903fbde858479d8dbe6e02585508d9ab3326b29a277be4 WHIRLPOOL c1dd29bd9a7f3cd1c00f31a0d80d2728ae97cdf45040605064470070bf0b6989d7f18331b243b8c9784b78bdba292da2e48a02ccce8e5a3b9988b6d7f4331081
 AUX quagga-link-libcap.patch 1027 SHA256 33bbab3490852b32f38437d50d64fcbb2a98e063503ccc46dd75cd350187853f SHA512 bc87b14432af75bc6e1bb27a7f90f0a05ddd98c6b554ef53535a2fc8e43f49c76762c8a0c240323817fdbb4e1ce29b868da7b768c597acce919febe8f040ec78 WHIRLPOOL 6be7d422ecdd4166c2bf22d8a2dbfdbdbcee9bb4d3af1d189457e3dda8d2746466533789c23f18ce9f726daf2c89b2b731675a8222d8957fb4410b550e24964f
 AUX quagga-services.init.2 1384 SHA256 51f604e45d82831fe2d34ec9a15ab65c6aaa21c7a3bc6856c97372cabbc06108 SHA512 e4d92a694f13ddeea9980b37de9322a19ca21f458fd4be621860c2d5835a78cb853a48bec91a858a48e8fead0dde7f993e2b7a4e119823bf74fa3e170102574e WHIRLPOOL 5ed2f7f801e1b0c859da04b2637c66eb6de94aa1e7ec553fd166e98d242d0081a5327a7a2cc79a715a93393cce71f0cfde15642e252ca8629ffdc23c5c9fc565
@@ -9,8 +12,21 @@ DIST quagga-0.99.20-backports-1.tar.bz2 1882 SHA256 2cca223deb57a56f5c58c49d8cdb
 DIST quagga-0.99.20-backports-2.tar.xz 1968 SHA256 6c2ab6f39bf6a006539603bbeca59c095e1f66ec96199f175bb12cc7d8ef532a SHA512 3609658186744deaccb3fb9c39e7260986da8f76f769a830a6dc392ad6a0b00909500b5b83ca031d9120c9af5ae19d0d733ce08f6131822fd54ebc8d83622efd WHIRLPOOL a961d3b9d96891422d60a746f9a12825100f91763e5c008e09446f826b676366fcca34feb810a2268f90df01c5b9520e44245d637cb79d68a59f6f74222ed456
 DIST quagga-0.99.20.tar.gz 2232520 SHA256 b7a98cc6b022bb0cb405557b3d920cf513150f64384dbd0a2248b5bd248df58b SHA512 f515496d9f437afb08c47519c42efd28946acaff2bd353233e00e27e6463dc08b56732c8ce027b76543da86f14906a00266420e41a909200f45dcf2c84259422 WHIRLPOOL e9cae164e48fe1e557f5149c3cfe364689f4f26cd848c71e5bfa9ca8fb1bb752249bcfabaa14c1505671aa4730bb3296928fa0a3587356442ce6b0345eebe480
 DIST quagga-0.99.21.tar.xz 1572264 SHA256 87329c3d9d4e5c0a74812e725026560c477f610eec9771e67baf513da0357246 SHA512 0f35cabfd7aa82e08f3f728660f0fe4c35a38e1146fca8ea37100e176333363cdd3cb22987cffd644f77852bfbf8b98da87310abdc575b2200415901837765cd WHIRLPOOL f745f4840671da06c6e6504c446e86c02f255f7bf5b35651aa205cf6e4021048fd3640b8b4a66a45798191105799f19aa77ea2b05d26cc2111aba22659722197
+DIST quagga-0.99.22.tar.xz 1595948 SHA256 50336547ed53a03a3fa9130de5721fb916c40fef6652a1a36c9a71fdf338c75a SHA512 580113cd9b68c1267cc737b98c64f15c8754c7ce2f9a23979b8beb03049ab81ac08feb4df38dbc46cfeeac79992bd6fa5e59a35c8f226945f752b873624718db WHIRLPOOL 8620da3e1457db2ece6df07eaea68f984ee2e7335c3f47a92a4aef605917b2c7078a83dfc20cbfb7721c08f37631be179a97277d8131bdb94e8f142aeba8ad86
 EBUILD quagga-0.99.20-r1.ebuild 3422 SHA256 575e977e42fcb57ca53d4c517f1e2bea934029d3132a90beb29da95d095fb158 SHA512 9e4479d62834e0f3b142806f82b602d6814d24614b1a538d178cda5fd418095162bfa93f4840ff418d262bfad5057df026114a2da6c9e6630199de6583f73bf2 WHIRLPOOL b2bc5616c7453bb5cf21f80353afcad29a094514b89d421e93ab0dadcd0fb67b0c2d65b2d24fe19d3a33b68d83f329a4e3ff26673f6f98566d037f0196305185
 EBUILD quagga-0.99.20.ebuild 3437 SHA256 f51edb691ca50079db8fd514b8616beb26c32722f9b938024aa7b4ac42740cdd SHA512 874d29a54ada41bb3c20bf8a8deebeed9b0f6c555b8cd0d28f161e5867ac983e3a5765381705060b5bddd6ad895111633e5219b61d066d9d18eec89be6e46bff WHIRLPOOL c57dcf0b8341fa000d592a8c4cbe52707545a0e3cb5f0c6d6ba1a4357694a2b582149e1bdb1bf83aa9054824c1fb2b0c026877e65a710464dfa504a3cdd421a0
 EBUILD quagga-0.99.21.ebuild 3616 SHA256 8564605e9b6c1b77a6a48bda831e57915527d88076b62f77d22cf0b433511447 SHA512 33ac2bab33d7b6e1f214af849a217086884a1f30eb02d6fbfaba1e43a7f1f97a6999fda084e7ec2c15db674cf0ec6e5e7b43db9540b68c8c81bf0391335e6110 WHIRLPOOL e7e78bd44fe27e53fe52f521ec8d3942cede9e5ffd662599dd662448e9dc43a33160a84a67f72d7c3ba25dffeacaf271f65f0988e173417a36b038382ad9d794
-MISC ChangeLog 23946 SHA256 550f984b4fff179604f91bb1adb51525e592920b4692559c7b34dee9e65cfd67 SHA512 7a7211fd49a49dfb8371a77acb76c3b6a5be1cbfc54718826779cdc19f980a570a8dd1b0eab0760530c065bd9148cca9a1385c005f32e18e9e2912a86d77cd86 WHIRLPOOL 19daa8b60b8e3e8dcdf909d74dc050d4bbb7d8e9b1f6a36bc594c3a60036f0a911f1d042ea1ccb787c3bf665762f2de14d230c30ac9ea479f653694b9ab248e2
-MISC metadata.xml 2188 SHA256 6abfe1dbf3523e5bc6b38bb4995589bdd48194b6c272b61a1ec2d0d373489abf SHA512 9f5641da1a13ef59a356c17aa0cbf74a505b336282c8830d4624c3f2afa0ab45a22256e6de4329a26bc268920cf6025ff9b6f16e939438262bb00c54be643575 WHIRLPOOL 7b4afaddd0576a95912a40e97221fc2d9a2b4131197fa26fded625203f97807099f57ef68c8cb55e82e365284d4c0ecfc0932f0c99477767a3f98ef7481dba05
+EBUILD quagga-0.99.22.ebuild 3548 SHA256 319b7af892dbff58155acb9ee2e4c90209754ddf65929d2ff1733f6903773b02 SHA512 af81cf225b297ac9d78bedd6b2065f3c7c1cda4505658b7de5df71382d3fdbf4752767b3cf0bca3b0a427f0d05d2f515102126590709ffeabc6e35ce94bd2abf WHIRLPOOL a0c4e5e6ec9f062e80bc0df237a4af5d60a6951222908d5b94ef345becf5a5e152407e6ea996441e0efbfedfde670bcdfa3ad8a5d69fd2e40565cc5f74bc154f
+MISC ChangeLog 24165 SHA256 6fd9c7f4b62ee93585233ad56aba5f57676cade5c6c8a7670e1b386843cb23e6 SHA512 ebd3ff4825d2b8ea8174bc5fe5ddc95ef0911a6a756ea1170d7f1f48d3e54336d8ac9a5ab4e9a11c570aeb2a7b12987d260513b56ffc3e2e767e3ffa435aab0f WHIRLPOOL 7bbba77f59d6cdf0504da40141acc556e3819790548dbaa40ec29cdf7dd25f17901c75ce3df85885518063c44056923cb80565448b755e7047d87ac3fba9268b
+MISC metadata.xml 2125 SHA256 a8fa9b5faa1486306615e9088458960f5dc6463c88e672234f04ee5ac0874e68 SHA512 ba254525fd2dea2cbfc6f2b5a2d6e82c8c2d5ddecb5687c38faa14ea8ec53ebcd44a934b2f2350cfe0bf28a216d93773813a64388514a4079d92108796ea30a3 WHIRLPOOL 381fb94ef4954da55d87724b0590a7ee95129d6b365d95455a9909b8ff499c0de4f5856c9eb81f619308efd2edda9a3c88840ee5c5789bfd689618afe8280131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRWwgyAAoJECo/aRed9267NvkH/jlsjSmC0aT98TsKlzNXvn4R
+czZ6iiJrRpuNo+MbIJF/ey56qsM2tWg5bZM1Jcp0e6pIVexboVgR8QxvDKR9R2rn
+uHB1Qg6XKbzqd6da7OTKkydE/AU2Oe84dAP9BVbQb5J/0zBnx/Aeqzyrl1ZlYvn+
+X6NGc2oAuP2XwHUydlEBwvZdiQjQSagOJip95XNlv1EX8gxz0t49/B4awXKxTR/R
+nhOIl68YR3aEU2SgBMawHWLcEoCvxKcwvBpwH+r8iUVfi9LzoBZI3Q3gXE4kbaoU
+Bxo+wm7yQoK2RbHpjRFUntdl6jnZuJ0ROgl+YWM+ythgSNvJiUO6m8oOYE5q0cE=
+=lsYt
+-----END PGP SIGNATURE-----
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index 79426fe54eab..8a4fab8dcb40 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/metadata.xml
@@ -1,43 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
-  <longdescription>
-    Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP
-    based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
-    OSPFv3, BGP-4, and BGP-4+. Quagga also supports special BGP Route Reflector and Route Server
-    behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing
-    protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol
-    MIBs. Furthermore Quagga supports OSPFAPI, a API interface to the OSPF LSDB. It supports
-    inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The
-    Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF
-    routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood
-    service state information into the routing domain
-  </longdescription>
-  <use>
-    <flag name="bgpclassless">
-      Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
-      at http://hasso.linux.ee/doku.php/english:network:quagga
-    </flag>
-    <flag name="multipath">
-      Enable multipath routes support for any number of routes
-    </flag>
-    <flag name="ospfapi">
-      Enable OSPFAPI support for client applications accessing the OSPF link state database
-    </flag>
-    <flag name="tcp-zebra">
-      Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
-      sockets are chosen otherwise
-    </flag>
-    <flag name="readline">
-      Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal
-      Interface Shell (vtysh)
-    </flag>
-    <flag name="pam">
-      Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Quagga Virtual Terminal Interface
-      Shell (vtysh); if the readline USE flag is disabled, this flag is ignored
-    </flag>
-  </use>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<longdescription>
+		Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP
+		based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
+		OSPFv3, BGP-4, and BGP-4+. Quagga also supports special BGP Route Reflector and Route Server
+		behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing
+		protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol
+		MIBs. Furthermore Quagga supports OSPFAPI, a API interface to the OSPF LSDB. It supports
+		inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The
+		Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF
+		routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood
+		service state information into the routing domain
+	</longdescription>
+	<use>
+		<flag name="bgpclassless">
+			Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
+			at http://hasso.linux.ee/doku.php/english:network:quagga
+		</flag>
+		<flag name="multipath">
+			Enable multipath routes support for any number of routes
+		</flag>
+		<flag name="ospfapi">
+			Enable OSPFAPI support for client applications accessing the OSPF link state database
+		</flag>
+		<flag name="tcp-zebra">
+			Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
+			sockets are chosen otherwise
+		</flag>
+		<flag name="readline">
+			Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal
+			Interface Shell (vtysh)
+		</flag>
+		<flag name="pam">
+			Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Quagga Virtual Terminal Interface
+			Shell (vtysh); if the readline USE flag is disabled, this flag is ignored
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/quagga/quagga-0.99.22.ebuild b/net-misc/quagga/quagga-0.99.22.ebuild
new file mode 100644
index 000000000000..06c760a10aa4
--- /dev/null
+++ b/net-misc/quagga/quagga-0.99.22.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.22.ebuild,v 1.1 2013/04/02 16:32:48 pinkbyte Exp $
+
+EAPI="5"
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+#BACKPORTS=2
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils eutils flag-o-matic multilib pam user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.xz}
+	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="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	snmp? ( net-analyzer/net-snmp )
+	readline? (
+		sys-libs/readline
+		pam? ( sys-libs/pam )
+	)
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.4"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/openrc
+	sys-apps/iproute2"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	[[ -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}"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	local myeconfargs=(
+		--enable-user=quagga
+		--enable-group=quagga
+		--enable-vty-group=quagga
+		--with-cflags="${CFLAGS}"
+		--sysconfdir=/etc/quagga
+		--enable-exampledir=/usr/share/doc/${PF}/samples
+		--localstatedir=/var/run/quagga
+		--disable-static
+		--disable-pie
+		$(use_enable caps capabilities)
+		$(usex snmp '--enable-snmp' '' '' '')
+		$(use_enable !elibc_glibc pcreposix)
+		$(use_enable tcp-zebra)
+		$(use_enable doc)
+		$(usex multipath $(use_enable multipath) '' '=0' '')
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '')
+		$(use_enable readline vtysh)
+		$(use_with pam libpam)
+		$(use_enable ipv6)
+		$(use_enable ipv6 babeld) # babeld does not build properly with USE="-ipv6", bug #446289
+		$(use_enable ipv6 ripngd)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 rtadv)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in ripd ospfd bgpd $(use ipv6 && echo babeld ripngd ospf6d); do
+		dosym zebra /etc/init.d/${service}
+	done
+
+	use readline && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}
+
+pkg_postinst() {
+	elog "Sample configuration files can be found in /usr/share/doc/${PF}/samples"
+	elog "You have to create config files in /etc/quagga before"
+	elog "starting one of the daemons."
+	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."
+}