4 files changed, 9 insertions, 142 deletions
diff --git a/net-analyzer/argus/ChangeLog b/net-analyzer/argus/ChangeLog
index 1a7e87734a85..5fd18286eb99 100644
--- a/net-analyzer/argus/ChangeLog
+++ b/net-analyzer/argus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/argus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.53 2012/09/23 08:56:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.54 2012/10/15 13:08:03 jer Exp $
+
+*argus-3.0.7.1 (15 Oct 2012)
+
+  15 Oct 2012; Jeroen Roovers <jer@gentoo.org> -argus-3.0.3.8.ebuild,
+  -argus-3.0.4.ebuild, -argus-3.0.6.ebuild, +argus-3.0.7.1.ebuild:
+  Version bump.
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> argus-3.0.6.1.ebuild:
   x86 stable wrt bug #434030
diff --git a/net-analyzer/argus/argus-3.0.3.8.ebuild b/net-analyzer/argus/argus-3.0.3.8.ebuild
deleted file mode 100644
index 8afe051c9679..000000000000
--- a/net-analyzer/argus/argus-3.0.3.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.3.8.ebuild,v 1.5 2012/06/12 02:13:49 zmedico Exp $
-
-EAPI="2"
-
-inherit autotools eutils user
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug tcpd"
-
-#	sasl? ( >=dev-libs/cyrus-sasl-2.1.22 )
-RDEPEND="net-libs/libpcap
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6"
-
-src_prepare() {
-	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-		-i argus/argus.c \
-		-i support/Config/argus.conf \
-		-i man/man8/argus.8 \
-		-i man/man5/argus.conf.5 || die
-
-	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-			-i support/Config/argus.conf || die
-
-	epatch "${FILESDIR}/argus-3.0.3.8-autoconf-2.65.patch"
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	#	$(use_with sasl) \
-	econf \
-		$(use_with tcpd wrappers)
-}
-
-src_install () {
-	doman man/man5/* man/man8/*
-	dosbin bin/argus{,bug} || die
-
-	dodoc ChangeLog CREDITS README || die
-
-	insinto /etc/argus
-	doins support/Config/argus.conf || die
-
-	newinitd "${FILESDIR}/argus.initd" argus || die
-	dodir /var/lib/argus
-}
-
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
-pkg_postinst() {
-	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-	elog "possible that init script will fail to work."
-}
diff --git a/net-analyzer/argus/argus-3.0.4.ebuild b/net-analyzer/argus/argus-3.0.4.ebuild
deleted file mode 100644
index 0178e0d1251c..000000000000
--- a/net-analyzer/argus/argus-3.0.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.4.ebuild,v 1.5 2012/06/12 02:13:49 zmedico Exp $
-
-EAPI="2"
-
-inherit autotools eutils user
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug tcpd"
-
-#	sasl? ( >=dev-libs/cyrus-sasl-2.1.22 )
-RDEPEND="net-libs/libpcap
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6"
-
-src_prepare() {
-	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-		-i argus/argus.c \
-		-i support/Config/argus.conf \
-		-i man/man8/argus.8 \
-		-i man/man5/argus.conf.5 || die
-
-	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-			-i support/Config/argus.conf || die
-	epatch "${FILESDIR}"/${P}-disable-tcp-wrappers-automagic.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use debug && touch .debug # enable debugging
-	econf $(use_with tcpd wrappers)
-}
-
-src_install () {
-	doman man/man5/* man/man8/*
-	dosbin bin/argus{,bug} || die
-
-	dodoc ChangeLog CREDITS README || die
-
-	insinto /etc/argus
-	doins support/Config/argus.conf || die
-
-	newinitd "${FILESDIR}/argus.initd" argus || die
-	dodir /var/lib/argus
-}
-
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
-pkg_postinst() {
-	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-	elog "possible that init script will fail to work."
-}
diff --git a/net-analyzer/argus/argus-3.0.6.ebuild b/net-analyzer/argus/argus-3.0.7.1.ebuild
index 50c16d65bde7..4bf207b3146c 100644
--- a/net-analyzer/argus/argus-3.0.6.ebuild
+++ b/net-analyzer/argus/argus-3.0.7.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.6.ebuild,v 1.6 2012/07/04 07:20:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.7.1.ebuild,v 1.1 2012/10/15 13:08:03 jer Exp $
 
 EAPI="4"
-
 inherit autotools eutils user
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
@@ -12,7 +11,7 @@ SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="