Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

10 files changed, 50 insertions, 358 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/Manifest b/net-analyzer/argus-clients/Manifest
index dbda275a33ad..cc5263288a78 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -3,27 +3,17 @@ Hash: SHA256
 
 AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 593 SHA256 660ffa757355cc450f646248bc324fa66038582466eb10985f4521e19bed0509 SHA512 f817bd51125c4c0c8f17b651db2edb1be232440f0a3e3922588e23f5e26c0cff3d0682a0d23654386b5db318d39daa20c6bc94966925d98e62ebae225da74894 WHIRLPOOL e7b8ba0274e356ca808388382b99d90a0fd42d6fe926b6072da0648b7abc4e5bbdfbf380e2026eda4ef7b2af7c69df04e4d573651b8cdd0554ee3c96ca7afd35
 AUX argus-clients-3.0.7.18-sasl.patch 613 SHA256 a2730cbfc16b92d58b86e0e736f4b16a38f37c098e19a6dda40f14bb4d81a69a SHA512 6ef2fac3ea75cd0cac6f29d2f5f3c6defe871b82b2c47f30421169a2ad6f525677a66322fc5db8815a4a2b61f5cefb33741f807e2164a671aea9fb5a7ef6492c WHIRLPOOL e19275a0ca9fff1c1153365f1766b08d1efa407cea258e0f7f825c3404cab9130848cf2fb98ef2b53f8612d365906e00435d6818d8ac60d43ade800bcc86e584
-AUX argus-clients-3.0.7.4-overflow.patch 335 SHA256 11603349a0c69a2819b2ac746387f78b4fa5aba5f61132aeb820be8f4210bfca SHA512 1e2437b07d4741a2d0109aee6435423105ac1e0b2d74dfc470def5ec5c97c17f8768b1a8ae9a45e8ac75d791a51f32becce294c25703af6bd1b9a1d039263ded WHIRLPOOL 589bf71d98716bd855a61e65ad10445346c0471d5c78a68c3a7962f7e738e571dd96e0a24f9334d8355669ef18419fd66cefd34284afd0e38bb951ddcaf561fb
+AUX argus-clients-3.0.7.21-curses-readline.patch 611 SHA256 75fd8b13b094126170ad9d19adaeedefe333c22bc85780fab1b1097de3025482 SHA512 17910c0e2e2d3efefd1efe713bea5b394087415d103aa18254c7f8e8e4f4aae7d8670db8ab9d6045c145bfc0d5e804c653eca6e1c169813075c1af37ff01a0b2 WHIRLPOOL 5a5122fb267d5cb22a62a85911b1969ece8e55cdeb8763eebb9ba989dc1103eb21cace21598754e0a1cc607163631084f2b42559d41237d440fb252d64e10996
 DIST argus-clients-3.0.6.2.tar.gz 2426454 SHA256 f51d7c8d18fa2236f3fe3726deb3c0b8308c0a6ca767c6089811963da95330fc SHA512 bd386fc8561f2c20bac287e4f562cc980935150ea0a987b281d2b952366ccc56ca380723517d5ccd31fd430605e2d6ed9b08f0d8ca88fc3a3bb96ee495f3c36a WHIRLPOOL f1123438afa10f01c14b7aa8bc90766974bae514bf0d41377627f189ba3dab7bca69870eff0f9e8a1e87ac257e97ae2cb9e6eb6ace3022c9697949820a54dab8
-DIST argus-clients-3.0.7.10.tar.gz 2563005 SHA256 6a49e72f0d3b938fb23721095d69bd4f04aceee825298f84cf84fc51ec0e4be9 SHA512 d6a0be6f419ace5638c42c3922f1857c4d96a18c591939f81fe1bb347e3178a1daa8f728cf77412bbe7ee7220b16ff93d871a181b2babf066a31ba85219edfb7 WHIRLPOOL d8df0b94c1a0f0bb11aef2bf849d2dfb36160f5dad9d9a8bbdf104d2d1ddcbab42b70859626bdd2916cd0f359694bad50469057ac6e8ba56fa09b8b83a8a94cc
-DIST argus-clients-3.0.7.11.tar.gz 2611237 SHA256 29fc15fbcdf3788e26490694b941d2a1deb84dadbeffd53ad29483ad689e7bd2 SHA512 e77727cb44209541f51cc3367b931e9c9b4f2b8202981b038814314c5e5bc0c3be4d875336dc66775bf9363d6077f1e9d352aebd326f5a7fd55dbae2a5930325 WHIRLPOOL 32f44db877a876ed0d174380a8d831702798cef8ee6b80b158e95cf93fffa8d46182afccefda2d12d93ce3cc0d382687fd5ea0cb91edebfc2b2370a044f0f233
-DIST argus-clients-3.0.7.12.tar.gz 2611272 SHA256 4206f9ca82dd8b56145d30deb7e52bcf367b5036d7a7636bcd66ce86dd703cf6 SHA512 6b0c1b1c0ea16fd334d05d4740c704bb4f87e90c10302dc5012f16fbbc60012b9b788c3a2a0507f32c5fb10680b86463f1e45cb4c947863604e77a78a2d7089a WHIRLPOOL 9deb85f9d4572ce6d8137a9e6c4583e0e21f72ba1e26b1b7adf7b93c2ecda877bfd6bb06085e2e9d4c645e124b4253f077014a2441cc1d9968e8b9d1e813dbf8
-DIST argus-clients-3.0.7.18.tar.gz 2598403 SHA256 50f6292e46bfbd87b41817eed2190a1c24b33c76bea3fafddf147fe2529071a4 SHA512 8f710ef6e47c3d87ec9d6f94c09e904807ed6755e544b9a99f022749964ef311883012015d0db227f7d329064d45c5c01cc5f8e90f78df531df7a538c2b54c34 WHIRLPOOL 58268982dd83a508d4767d7ff35663dbd3713c533d9c8238926ab1cc34e7220f73f0318115f2bf1fd2426944475b797861b0e61c01d8cf527382774d458a97c4
-DIST argus-clients-3.0.7.5.tar.gz 2519645 SHA256 eefb5f1f97b59e7e49b19767afa97cf3118f7ee7f4dad45179a66a15fe727180 SHA512 512409b2c19cad41d32057086f4ec8cdd3590b1162ab242fcc49dc8e7a2a32fdc01aa4d8d55baa9bb73f8bea0983217b5160088ae3297995add5c8fab08f31b5 WHIRLPOOL cb07f19c8d9d040d693b9bef58ac1ab5e82074db713397a4f0a26453bee24344c625f1112da64d6354a82cdb0d7fb15a410b3e8782c6ca54fc6fd3194a02d309
-DIST argus-clients-3.0.7.9.tar.gz 2561756 SHA256 2ffd93f79e31d2e3882629128afb2cb346c40639f02c4fa120bb6d8e49e4d881 SHA512 922ca1f63545d04ea3774ee56b114fe9646af5dd642b4e3df7bc6d442e2ea7338dafe6006a333c0843fac008da7725846eca823ab9e55927b54ec3e5ba2656a0 WHIRLPOOL 7331acc3a382c95013c6e166f28a2eeaa69d7548e76c78bf8d7d2a155ad639a587f1e634b3c2206fe1e905ac3ed912e0ca94f9f970876227f0e2d8ba3824b390
+DIST argus-clients-3.0.7.21.tar.gz 2603851 SHA256 631c3e45aafac377ee8ee02232e35cddad9ab3e7dc9d8c3f63275556c1b6f186 SHA512 df38a27f10a58a7ef8b2ecf58eaa81d05b488d52feb007b75499fb43641544a96906a903acaef4f149fe5193071d29894158c928b63f5f06149e8680bf106229 WHIRLPOOL 4defd4dc0ef6216088bb18f0db9955bf3c2146d4b39ad3b62357ee26483c372dfd8465ad4c4f8e1ebd604ce3c6ec0abd61241ea3a5319d3e19f9e2b4200ae017
 EBUILD argus-clients-3.0.6.2.ebuild 1312 SHA256 cfc6aad9351fd77e0e49529797e760cd1560ecb0d382d51816c662fc24e9f07d SHA512 91c1b30451a72cf7bf7cfaf12685ef2f7a40f0d277ac19b51f753e64a13a89fe6526c270267d5d24f089b39344bda635bbd00ef17f5f87dc94988635a87ec225 WHIRLPOOL 32de07db0a60f9612c7305da1102a70168fffc69cc0c8abb058b4df09da07ba248a07ab7509ba1d3697789d4e958351e1644a19610855296c2cf303e74ea2e6d
-EBUILD argus-clients-3.0.7.10.ebuild 1367 SHA256 1359616ddf735f0fb0a62e661b04450fa194951c6140ba146db6b072fa80f32a SHA512 adfd4a4001288874df16ef7eb35b092cc4f7b8a2f6d946962e4418fcea0b8ed4e0111e273bf327b8644dab722a4b56bd479d0763d549dd65cb3b0afbf67f63fe WHIRLPOOL 4d05685f5aeb3d8bc9f5a002733a4fcfb01481a5d1b5aafe3b7708c14580ec11db1e7ff11ac9b77c19cff28d220cb2a9bc0ff03d896eaf45c5710cdeda0fd104
-EBUILD argus-clients-3.0.7.11.ebuild 1367 SHA256 1613c034484e2752a5553ca7440e5d85fc6b02a1e69e3c472b3076eb205ebfbc SHA512 ce751fb9978be6495ef8207faf27a60dbffe5fc59978b56379bf8e7cbb3af12247780a327d5e7d21ec4636bc59330831ed447d06fd00be067644107dfe4cf4ef WHIRLPOOL 5593bed149528c4450d950cbf7f48f9f767210347af2e5c89b8297b695b1c76dbdd8ab13bbd6ea2a3dc3e1439ee3928bd5f7423cad2f004cd2538eb7e28e80dc
-EBUILD argus-clients-3.0.7.12.ebuild 1438 SHA256 3b9c8fa6d6917879c87c750b25c102cada39fa78e1497b6cd6dedbaab80dbcf6 SHA512 1a6fc4c5b6941e3624a65b9c430bd39cff2d69d6396b321b09ca6230fdbcdd89368eee1bf80e47479e9fc6e55c733d8ce925bb39c0f8d20abdd1c0b2712c259e WHIRLPOOL 20ddae57b327b68cf048de85debe8de2a6675d7702996691e69d236e204ead117acc20c6595f6a8a26081e4f73411ad4001868a79765b3ca5ef366c86df28776
-EBUILD argus-clients-3.0.7.18.ebuild 1497 SHA256 0bddd567e73efa6bb9876568d4d4e0cab2af57f03327f2f2cfd7532f6e858475 SHA512 18264e8afe39f0ee8e94356d5307d5c4bd0432ad4d695f8020e4d55052d7b611ef6e8149d6c5368d8069c46dc494d78b6a4bac5f8f90212608b6ef6c876c6603 WHIRLPOOL 6452dc4c126b23d45d93ac6fcb47ca5bc1587411e9e060fd287714de80cfece5b8f6e1b68559ccffdac0c4d0696d8250dafdde06edd4f7a10d098b7d2e675e77
-EBUILD argus-clients-3.0.7.5.ebuild 1366 SHA256 32d6ec2c22745df941f35c42f357e5496c9be62f730aadbef4262bb1c3886e55 SHA512 8b1aec9efe501eb9b8ae57b6ec1ac8fa89e5087e7e6a93de5d3c2b8e5ad0840ecf87d8ed2c695bad303cdbbab3153ae69c7a221324673deb889264b0c09a1ea1 WHIRLPOOL 9489d720b5f5fe0ba93e799c9618571e505976563eb2eceabf495e7e606dadc85c58f76ab741262e8e7deae9c4f400671b74797b00cb82b4b17912f325f29536
-EBUILD argus-clients-3.0.7.9.ebuild 1366 SHA256 93bc5d05adb69ab91e9497c70f161fda2f728163d9cac33b28bbef234189ee90 SHA512 f572397f73d746b3a8eaf76b4a6ae2553f5e7dd231776671579be33d4e7402615c533c8f248f52bc076865e8392cd9919396de5b5a4b00c26e2523611e885eed WHIRLPOOL b00ada9ab70e24d7f22aa2aeec93d9bc260cbdde86f6cb77ab889501d9e3fd2b652a12f659955ebb6c074ae72a0afa282440f6bb2a2c174883550d920b4d39d5
-MISC ChangeLog 9932 SHA256 046fee32b6923e8456e4f43d5aa73a7989433bf247b6ce291bf27872e2511f79 SHA512 a41fd835391ceeafb5070ba17278f1c950479dee2b91ff2e1e16f958e6b04e329f4734ff403d178176f3288e9e0e9f68a7ebcfe2d4d44e264bef97f46cf2062b WHIRLPOOL 0e600269b34989c282fd2a66d77379a1a138563809126bb2b88c4495cd6bd04b187230854c03843efdb8105c3c23d6360e3045b44557398537eb909dae5ebd47
+EBUILD argus-clients-3.0.7.21.ebuild 1621 SHA256 13b38230613cb4aae983fb180303d208560d4508935eeb1663a3c58dcdb4ec09 SHA512 8045c28fa8dfab1e1a50e0e2ef9a16e2ffb5372fd0c4e3723bc3be1637fc88e79c55eff9cb8e105a5c2efaee8bc8140a119c9444891f48535b9f18c070dba9d4 WHIRLPOOL a6fcb71529dc46ee4e8a63c0bde1cc877943cf9b807cc11c6b96f08c6e345c3ab5b6aeb1fa26a113f02ce8b2456ee0841c31ce20e6c8f70622aae6157134fbab
+MISC ChangeLog 10365 SHA256 4c916ee34dbca38197b90928ef2d797b5578cf3b926348d07bad1eba3cad09ef SHA512 12c165a0bb466837e8536d9f766fcd5fbb3f8ad41241281bc98d1a95afe9fd13dc3a093232d21c0df637c4feb3c433f006c8684e91dbd2254f8a7691b448febf WHIRLPOOL 5b7daf3b25fb43984d49960d74c4769ec1f2ec7c0209e77dbf25cbb6307dd08f56299fdf1f22ae2615bb40e220305dc28bc29373c3fc857a27bfb3690254306a
 MISC metadata.xml 268 SHA256 a7f0d633cf4ea45d16056b1e9ccdb657e4750e05a1a57bec18c4d42d4d9a3766 SHA512 c6c6fda7bffb51085d1ca255e241cea4fac77c3948a2f120fe1c6b74d06a2c21b17928d1dcfc0df9d3f51de959631fc40645240000114c8c0048a2b122a621e4 WHIRLPOOL f19389783a4c0c045cdd032b48068b07fd007b4668943f68b4cfbedf988490140e41862970bf3ab1f6515a8c8321a1ff6bd5739c98cd4426b921e9582269dab6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKjS8QACgkQVWmRsqeSphNNmQCcC93M9lwYSXi2XJrDl5Db5JSu
-wbgAmwe9YLznAWbYCc48qVTW9oNxgk0x
-=iX2r
+iEYEAREIAAYFAlMXWf4ACgkQVWmRsqeSphMz1gCfSi+zosT3OLeACf+m1sRG4UDZ
+qswAnArUT/FCGmTRobjECr3+o9z+EdEl
+=5LrK
 -----END PGP SIGNATURE-----
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);