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

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 167 insertions, 41 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/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."
+}