Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

9 files changed, 43 insertions, 341 deletions

diff --git a/net-analyzer/argus-clients/ChangeLog b/net-analyzer/argus-clients/ChangeLog
index b30e232be969..119a146bc5ee 100644
--- a/net-analyzer/argus-clients/ChangeLog
+++ b/net-analyzer/argus-clients/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/argus-clients
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.60 2013/12/07 16:24:34 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.61 2014/03/05 17:08:12 jer Exp $
+
+*argus-clients-3.0.7.21 (05 Mar 2014)
+
+  05 Mar 2014; Jeroen Roovers <jer@gentoo.org> -argus-clients-3.0.7.5.ebuild,
+  -argus-clients-3.0.7.9.ebuild, -argus-clients-3.0.7.10.ebuild,
+  -argus-clients-3.0.7.11.ebuild, -argus-clients-3.0.7.12.ebuild,
+  -argus-clients-3.0.7.18.ebuild, +argus-clients-3.0.7.21.ebuild,
+  -files/argus-clients-3.0.7.4-overflow.patch,
+  +files/argus-clients-3.0.7.21-curses-readline.patch:
+  Version bump.
 
   07 Dec 2013; Jeroen Roovers <jer@gentoo.org> argus-clients-3.0.7.18.ebuild,
   +files/argus-clients-3.0.7.18-sasl.patch:
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.10.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.10.ebuild
deleted file mode 100644
index 89eda5a51591..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.10.ebuild,v 1.1 2013/07/03 14:11:48 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.4-overflow.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.11.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.11.ebuild
deleted file mode 100644
index 7306c180c9ac..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.11.ebuild,v 1.1 2013/07/11 23:13:28 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.4-overflow.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.12.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.12.ebuild
deleted file mode 100644
index 9abc2c2da2b4..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.12.ebuild,v 1.2 2013/08/17 15:59:04 jer Exp $
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
-
-	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.21.ebuild
index f93ce5311630..d8b321c625fc 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.7.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.18.ebuild,v 1.2 2013/12/07 16:24:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.21.ebuild,v 1.1 2014/03/05 17:08:12 jer Exp $
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
@@ -34,12 +34,14 @@ DEPEND="
 	${MY_CDEPEND}
 	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.18-sasl.patch
+		"${FILESDIR}"/${PN}-3.0.7.18-sasl.patch \
+		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
 
 	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
 	tc-export AR RANLIB
@@ -58,11 +60,14 @@ src_configure() {
 }
 
 src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}" RANLIB=$(tc-getRANLIB)
+	# racurses uses both libncurses and libtinfo, if present
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		RANLIB=$(tc-getRANLIB) \
+		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
 src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
 	dobin bin/ra*
 	dodoc ChangeLog CREDITS README CHANGES
 	doman man/man{1,5}/*
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.5.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.5.ebuild
deleted file mode 100644
index b5c6c63c5f74..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.5.ebuild,v 1.1 2013/02/20 02:07:29 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.4-overflow.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.9.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.9.ebuild
deleted file mode 100644
index bea070fc1029..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.9.ebuild,v 1.1 2013/07/03 14:03:54 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.4-overflow.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.7.21-curses-readline.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.7.21-curses-readline.patch
new file mode 100644
index 000000000000..787ff5ac9118
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.7.21-curses-readline.patch
@@ -0,0 +1,21 @@
+--- a/examples/ratop/Makefile.in
++++ b/examples/ratop/Makefile.in
+@@ -54,7 +54,8 @@
+ DEFS = @DEFS@
+ COMPATLIB = @COMPATLIB@ @LIB_SASL@ @LIBS@ @V_THREADS@ @V_GEOIPDEP@ @V_PCRE@ @V_FTDEP@ @ZLIB@
+ 
+-CURSESLIB = @CURSESLIB@ @V_READLINE@
++CURSESLIB = @CURSESLIB@
++V_READLINE = @V_READLINE@
+ 
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
+@@ -93,7 +94,7 @@
+ all: $(PROGS)
+ 
+ $(INSTALLBIN)/ratop: $(OBJ) $(LIB)
+-	$(CC) $(CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(LIB) $(COMPATLIB) $(CURSESLIB)
++	$(CC) $(CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(LIB) $(COMPATLIB) $(CURSESLIB) $(V_READLINE)
+ 
+ CLEANFILES = $(OBJ) $(PROGS)
+ 
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.7.4-overflow.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.7.4-overflow.patch
deleted file mode 100644
index 28d9fb1af6db..000000000000
--- a/net-analyzer/argus-clients/files/argus-clients-3.0.7.4-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common/argus_util.c
-+++ b/common/argus_util.c
-@@ -7473,7 +7473,7 @@
-             default: format = "%d"; break;
-          }
-       }
--      snprintf (upstr, 128, format, port);
-+      snprintf (upstr, sizeof(upstr), format, port);
- 
-       if (parser->ArgusPrintXml) {
-          sprintf (buf, " %sPort = \"%s\"", dirstr, upstr);