Add a readline USE flag to disable vtysh; ignore pam USE flag if vtysh is disabled; disable forced PIE build; inline most of the parameters to econf call; rename PAM file to Quagga (since that's what the code looks for); update metadata for flag documentation and reduce the description.

(Portage version: 2.2_rc75/cvs/Linux x86_64)

3 files changed, 52 insertions, 26 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 56d970d61026..df1333e2ca65 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,14 @@
 # Copyright 1999-2010 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.87 2010/09/06 03:31:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.88 2010/09/06 03:59:09 flameeyes Exp $
+
+  06 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  quagga-0.99.17-r1.ebuild, metadata.xml:
+  Add a readline USE flag to disable vtysh; ignore pam USE flag if vtysh is
+  disabled; disable forced PIE build; inline most of the parameters to econf
+  call; rename PAM file to Quagga (since that's what the code looks for);
+  update metadata for flag documentation and reduce the description.
 
 *quagga-0.99.17-r1 (06 Sep 2010)
 
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index d856f92661f4..c2157fe8eb2a 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/metadata.xml
@@ -12,15 +12,14 @@
   <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+ (*note Supported RFC::). 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 (*note SNMP Support::). Furthermore Quagga supports OSPFAPI
-    (*note OSPFAPI Support::), 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.
+    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">
@@ -48,5 +47,13 @@
       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 teh 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.17-r1.ebuild b/net-misc/quagga/quagga-0.99.17-r1.ebuild
index 81886c933ca8..245c26cff43d 100644
--- a/net-misc/quagga/quagga-0.99.17-r1.ebuild
+++ b/net-misc/quagga/quagga-0.99.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild,v 1.1 2010/09/06 03:31:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild,v 1.2 2010/09/06 03:59:09 flameeyes Exp $
 
 EAPI="2"
 
@@ -18,12 +18,15 @@ SRC_URI="http://www.quagga.net/download/${P}.tar.gz
 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"
+IUSE="caps doc ipv6 snmp pam bgpclassless ospfapi realms multipath tcp-zebra elibc_glibc +readline"
 
-COMMON_DEPEND="sys-libs/readline
+COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
 	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )
+	readline? (
+		sys-libs/readline
+		pam? ( sys-libs/pam )
+	)
 	!elibc_glibc? ( dev-libs/libpcre )"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/libtool-2.2.4"
@@ -51,18 +54,11 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--disable-static \
-		$(use_enable caps capabilities) \
-		$(use_enable snmp) \
-		$(use_with pam libpam) \
-		$(use_enable !elibc_glibc 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"
+	local myconf=
+
 	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"
 
@@ -71,10 +67,26 @@ src_configure() {
 		--enable-group=quagga \
 		--enable-vty-group=quagga \
 		--with-cflags="${CFLAGS}" \
-		--enable-vtysh \
 		--sysconfdir=/etc/quagga \
 		--enable-exampledir=/usr/share/doc/${PF}/samples \
 		--localstatedir=/var/run/quagga \
+		--disable-static \
+		--disable-pie \
+		\
+		$(use_enable caps capabilities) \
+		$(use_enable snmp) \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable tcp-zebra) \
+		$(use_enable doc) \
+		\
+		$(use_enable readline vtysh) \
+		$(use_with pam libpam) \
+		\
+		$(use_enable ipv6) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 rtadv) \
+		\
 		${myconf} \
 		|| die "configure failed"
 }
@@ -96,7 +108,7 @@ src_install() {
 		ln -s ripd "${D}"/etc/init.d/${service} || die
 	done
 
-	newpamd "${FILESDIR}/quagga.pam" quagga
+	use readline && newpamd "${FILESDIR}/quagga.pam" Quagga
 }
 
 pkg_postinst() {