Version bump.

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

7 files changed, 13 insertions, 329 deletions

diff --git a/net-analyzer/argus/ChangeLog b/net-analyzer/argus/ChangeLog
index 41360869d656..03e840fc1ce0 100644
--- a/net-analyzer/argus/ChangeLog
+++ b/net-analyzer/argus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/argus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.60 2014/05/18 03:20:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.61 2014/06/05 22:41:47 jer Exp $
+
+*argus-3.0.7.7 (05 Jun 2014)
+
+  05 Jun 2014; Jeroen Roovers <jer@gentoo.org> -argus-3.0.7.1.ebuild,
+  -argus-3.0.7.2.ebuild, -argus-3.0.7.3.ebuild, -argus-3.0.7.4.ebuild,
+  -argus-3.0.7.5.ebuild, +argus-3.0.7.7.ebuild,
+  -files/argus-3.0.3.8-autoconf-2.65.patch:
+  Version bump.
 
 *argus-3.0.7.6 (18 May 2014)
 
diff --git a/net-analyzer/argus/argus-3.0.7.1.ebuild b/net-analyzer/argus/argus-3.0.7.1.ebuild
deleted file mode 100644
index 928c6238e3e4..000000000000
--- a/net-analyzer/argus/argus-3.0.7.1.ebuild
+++ /dev/null
@@ -1,77 +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/argus-3.0.7.1.ebuild,v 1.2 2013/01/03 00:43:21 jer Exp $
-
-EAPI="4"
-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-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug sasl tcpd"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/zlib
-	sasl? ( dev-libs/cyrus-sasl )
-	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}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install () {
-	doman man/man5/* man/man8/*
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	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.7.2.ebuild b/net-analyzer/argus/argus-3.0.7.2.ebuild
deleted file mode 100644
index 1a6a35d1223a..000000000000
--- a/net-analyzer/argus/argus-3.0.7.2.ebuild
+++ /dev/null
@@ -1,77 +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/argus-3.0.7.2.ebuild,v 1.1 2013/03/10 14:57:13 jer Exp $
-
-EAPI="4"
-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-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug sasl tcpd"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/zlib
-	sasl? ( dev-libs/cyrus-sasl )
-	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}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install () {
-	doman man/man5/* man/man8/*
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	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.7.3.ebuild b/net-analyzer/argus/argus-3.0.7.3.ebuild
deleted file mode 100644
index 61ba9ab99de6..000000000000
--- a/net-analyzer/argus/argus-3.0.7.3.ebuild
+++ /dev/null
@@ -1,78 +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/argus-3.0.7.3.ebuild,v 1.1 2013/07/03 14:07:32 jer Exp $
-
-EAPI="4"
-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-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug sasl tcpd"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/zlib
-	sasl? ( dev-libs/cyrus-sasl )
-	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}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
-		"${FILESDIR}"/${P}-DLT_IPNET.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install () {
-	doman man/man5/* man/man8/*
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	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.7.4.ebuild b/net-analyzer/argus/argus-3.0.7.4.ebuild
deleted file mode 100644
index 68da68482178..000000000000
--- a/net-analyzer/argus/argus-3.0.7.4.ebuild
+++ /dev/null
@@ -1,79 +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/argus-3.0.7.4.ebuild,v 1.1 2013/08/17 14:21:53 jer Exp $
-
-EAPI="4"
-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-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug sasl tcpd"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/zlib
-	sasl? ( dev-libs/cyrus-sasl )
-	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}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
-		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug # enable debugging
-	econf $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install () {
-	doman man/man5/*.5 man/man8/*.8
-
-	dosbin bin/argus{,bug}
-
-	dodoc ChangeLog CREDITS README
-
-	insinto /etc/argus
-	doins support/Config/argus.conf
-
-	newinitd "${FILESDIR}/argus.initd" argus
-	keepdir /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.7.5.ebuild b/net-analyzer/argus/argus-3.0.7.7.ebuild
index 7144a83150f0..3f24bb2954b0 100644
--- a/net-analyzer/argus/argus-3.0.7.5.ebuild
+++ b/net-analyzer/argus/argus-3.0.7.7.ebuild
@@ -1,8 +1,8 @@
-# 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/argus-3.0.7.5.ebuild,v 1.1 2013/12/06 16:33:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.7.7.ebuild,v 1.1 2014/06/05 22:41:47 jer Exp $
 
-EAPI="4"
+EAPI=5
 inherit autotools eutils user
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
@@ -75,5 +75,5 @@ pkg_preinst() {
 
 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."
+	elog "possible that the init script will fail to work."
 }
diff --git a/net-analyzer/argus/files/argus-3.0.3.8-autoconf-2.65.patch b/net-analyzer/argus/files/argus-3.0.3.8-autoconf-2.65.patch
deleted file mode 100644
index 97db473eac40..000000000000
--- a/net-analyzer/argus/files/argus-3.0.3.8-autoconf-2.65.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'aclocal.m4'
---- aclocal.m4	2010-05-06 09:00:58 +0000
-+++ aclocal.m4	2010-05-06 09:01:19 +0000
-@@ -93,7 +93,7 @@
- dnl
- AC_DEFUN(AC_LBL_C_INIT,
-     [AC_PREREQ(2.12)
--    AC_BEFORE([AC_PROG_CC])
-+    AC_REQUIRE([AC_PROG_CC])
-     AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
-     AC_BEFORE([$0], [AC_LBL_DEVEL])
-     AC_BEFORE([$0], [AC_QOSIENT_DEBUG])
-