Remove "-l 255" from ZEBRA_OPTS (#279763). Bump version and add doc USE flag.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 18 insertions, 125 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 6cb55d7318cd..2035a6fc7ba2 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.83 2009/06/23 21:12:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.84 2009/08/16 12:10:11 mrness Exp $
+
+*quagga-0.99.14 (16 Aug 2009)
+
+  16 Aug 2009; Alin Năstac <mrness@gentoo.org> files/zebra.conf,
+  -quagga-0.99.12.ebuild, -quagga-0.99.12-r1.ebuild, +quagga-0.99.14.ebuild:
+  Remove "-l 255" from ZEBRA_OPTS (#279763). Bump version and add doc USE flag.
 
 *quagga-0.99.13 (23 Jun 2009)
 
diff --git a/net-misc/quagga/files/zebra.conf b/net-misc/quagga/files/zebra.conf
index a5256acd04d4..027273b6da0a 100644
--- a/net-misc/quagga/files/zebra.conf
+++ b/net-misc/quagga/files/zebra.conf
@@ -1,7 +1,2 @@
-# Additional command-line parameters to run zebra with:
-#	-k, --keep_kernel     Don't delete old routes which installed by zebra.
-#	-l, --log_mode number Set verbose log mode flag
-#	-A, --vty_addr addr   Set vty's bind address
-#	-P, --vty_port port   Set vty's port number
-#	-r, --retain          When program terminates, retain added route by zebra.
-ZEBRA_OPTS="-l 255"
+# Additional command-line parameters to run zebra with; see man zebra
+ZEBRA_OPTS=""
diff --git a/net-misc/quagga/quagga-0.99.12.ebuild b/net-misc/quagga/quagga-0.99.12.ebuild
deleted file mode 100644
index ada3c7890e41..000000000000
--- a/net-misc/quagga/quagga-0.99.12.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.12.ebuild,v 1.1 2009/05/13 21:27:46 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-20090513.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"
-
-COMMON_DEPEND="sys-libs/readline
-	caps? ( sys-libs/libcap )
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/libtool-2.2.4"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-src_prepare() {
-	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-	epatch "${WORKDIR}/patch/${P}-ipv6.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."
-}
diff --git a/net-misc/quagga/quagga-0.99.12-r1.ebuild b/net-misc/quagga/quagga-0.99.14.ebuild
index fea5c06d5481..73a941727c2d 100644
--- a/net-misc/quagga/quagga-0.99.12-r1.ebuild
+++ b/net-misc/quagga/quagga-0.99.14.ebuild
@@ -1,6 +1,6 @@
 # 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.12-r1.ebuild,v 1.1 2009/06/14 07:41:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.14.ebuild,v 1.1 2009/08/16 12:10:11 mrness Exp $
 
 EAPI="2"
 
@@ -9,28 +9,28 @@ 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-20090614.tar.gz"
+	mirror://gentoo/${P}-patches-20090816.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"
+IUSE="caps doc ipv6 snmp pam pcre bgpclassless ospfapi realms multipath tcp-zebra"
 RESTRICT="userpriv"
 
 COMMON_DEPEND="sys-libs/readline
 	caps? ( sys-libs/libcap )
 	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )"
+	pam? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/libtool-2.2.4"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/iproute2"
 
 src_prepare() {
-	epatch "${WORKDIR}/patch/${P}-bgp-refcount.patch"
 	epatch "${WORKDIR}/patch/${P}-ipaddr-bug486.diff"
 	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-	epatch "${WORKDIR}/patch/${P}-ipv6.patch"
+	epatch "${WORKDIR}/patch/${P}-libpcre.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"
@@ -46,7 +46,9 @@ src_configure() {
 		$(use_enable caps capabilities) \
 		$(use_enable snmp) \
 		$(use_with pam libpam) \
-		$(use_enable tcp-zebra)"
+		$(use_enable pcre pcreposix) \
+		$(use_enable tcp-zebra)
+		$(use_enable doc)"
 	use ipv6 \
 			&& myconf="${myconf} --enable-ipv6 --enable-ripngd --enable-ospf6d --enable-rtadv" \
 			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"