Mark 1.31-r2 x86 stable.

(Portage version: 2.1_pre4-r1 vanquishing potions will fly)

6 files changed, 7 insertions, 181 deletions

diff --git a/net-analyzer/ipac-ng/ChangeLog b/net-analyzer/ipac-ng/ChangeLog
index 77ff988ad761..6159091f4ca9 100644
--- a/net-analyzer/ipac-ng/ChangeLog
+++ b/net-analyzer/ipac-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ipac-ng
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.23 2006/01/16 01:16:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.24 2006/02/26 00:04:02 vanquirius Exp $
+
+  26 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -ipac-ng-1.30.ebuild,
+  -ipac-ng-1.31-r1.ebuild, ipac-ng-1.31-r2.ebuild:
+  Mark 1.31-r2 x86 stable.
 
   16 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> ipac-ng-1.31-r2.ebuild:
   Use mirror://gentoo instead of my devspace.
diff --git a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.30 b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.30
deleted file mode 100644
index 38e49ee53dd0..000000000000
--- a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89eab6631528b1a946e7b9dec6ee8799 ipac-ng-1.30.tar.bz2 159033
diff --git a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31-r1 b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31-r1
deleted file mode 100644
index b1c81b970e22..000000000000
--- a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9ed8a729145ae613b3cdc518f1750e3 ipac-ng-1.31.tar.bz2 162843
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild
deleted file mode 100644
index 70c7938490f9..000000000000
--- a/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild,v 1.6 2005/07/09 18:28:13 swegener Exp $
-
-DESCRIPTION="ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg"
-HOMEPAGE="http://sourceforge.net/projects/ipac-ng/"
-SRC_URI="mirror://sourceforge/ipac-ng/${P/_p/pl}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gd sqlite"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-lang/perl
-	gd? ( dev-perl/GD )
-	sqlite? ( =dev-db/sqlite-2* )
-	!sqlite? ( sys-libs/gdbm )
-	sys-devel/flex
-	virtual/libc"
-RDEPEND="net-firewall/iptables
-	virtual/cron
-	dev-lang/perl
-	gd? ( dev-perl/GD )
-	sqlite? ( =dev-db/sqlite-2* )
-	!sqlite? ( sys-libs/gdbm )
-	virtual/libc"
-
-src_compile() {
-	local myconf
-
-	if use sqlite; then
-		myconf="--enable-default-storage=sqlite";
-	else
-		myconf="--enable-default-storage=gdbm";
-	fi
-
-	econf ${myconf} \
-		--enable-default-agent=iptables \
-		--enable-default-access=files \
-		--enable-classic=yes \
-		|| die "./configure failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodir /var/lib/ipac
-
-	insinto /etc/ipac-ng
-	newins ${FILESDIR}/ipac.conf.${PVR} ipac.conf
-	newins ${FILESDIR}/rules.conf.${PVR} rules.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ipac-ng.rc.${PVR} ipac-ng
-
-	exeinto /etc/cron.hourly
-	newexe ${FILESDIR}/ipac-ng.cron.${PVR} ipac-ng
-
-	dodoc README TODO doc/* CHANGELOG
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "                         W A R N I N G !"
-	ewarn "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
-	ewarn "this WILL save ipac rules and can cause problems!"
-	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
-	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
-	ewarn
-	einfo "the accounting database is at /var/lib/ipac"
-	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
-	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
-	einfo "fetchipac is run by cron every hour by /etc/cron.daily/ipac-ng"
-	einfo "after you changed rules.conf you have to run \"fetchipac -S\" or"
-	einfo "stop/start the service so your iptables gets updated"
-	einfo "if ipac is not working with the default configuration make"
-	einfo "rm /etc/ipac-ng/* and rm /var/lib/ipac/* and emerge again"
-}
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild
deleted file mode 100644
index d30ea704a963..000000000000
--- a/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild,v 1.5 2005/10/01 19:12:50 blubb Exp $
-
-inherit eutils
-
-DESCRIPTION="ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg"
-HOMEPAGE="http://sourceforge.net/projects/ipac-ng/"
-SRC_URI="mirror://sourceforge/ipac-ng/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gd sqlite postgres"
-
-RDEPEND="virtual/libc
-	sqlite? ( =dev-db/sqlite-2* )
-	!sqlite? ( !postgres? ( sys-libs/gdbm ) )
-	postgres? ( dev-db/postgresql )
-	!postgres? ( !sqlite? ( sys-libs/gdbm ) )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-RDEPEND="${RDEPEND}
-	net-firewall/iptables
-	virtual/cron
-	dev-lang/perl
-	gd? ( dev-perl/GD )"
-
-pkg_setup() {
-	if use sqlite && use postgres ; then
-		die "You have both sqlite and postgres in USE. Please choose one or the other."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-iptables.patch
-}
-
-src_compile() {
-	local db="gdbm"
-	use sqlite && db="sqlite"
-	use postgres && db="postgres"
-
-	econf \
-		--enable-default-storage=${db} \
-		--enable-default-agent=iptables \
-		--enable-default-access=files \
-		--enable-classic=yes \
-		|| die "configure failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	einfo "self test is broken"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir /var/lib/ipac
-
-	insinto /etc/ipac-ng
-	newins ${FILESDIR}/ipac.conf.1.30 ipac.conf
-	newins ${FILESDIR}/rules.conf.1.30 rules.conf
-
-	newinitd ${FILESDIR}/ipac-ng.rc.1.30 ipac-ng
-
-	exeinto /etc/cron.hourly
-	newexe ${FILESDIR}/ipac-ng.cron.1.30 ipac-ng
-
-	dodoc README TODO doc/* CHANGELOG
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "                         W A R N I N G !"
-	ewarn "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
-	ewarn "this WILL save ipac rules and can cause problems!"
-	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
-	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
-	ewarn
-	einfo "the accounting database is at /var/lib/ipac"
-	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
-	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
-	einfo "fetchipac is run by cron every hour by /etc/cron.hourly/ipac-ng"
-	einfo "after you changed rules.conf you have to run \"fetchipac -S\" or"
-	einfo "stop/start the service so your iptables gets updated"
-	einfo "if ipac is not working with the default configuration make"
-	einfo "rm /etc/ipac-ng/* and rm /var/lib/ipac/* and emerge again"
-}
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
index 50c0e7bd20cd..d609e0e41889 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild,v 1.4 2006/01/16 01:16:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild,v 1.5 2006/02/26 00:04:02 vanquirius Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ipac-ng/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gd sqlite postgres"
 
 RDEPEND="virtual/libc