8 files changed, 14 insertions, 58 deletions
diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index a03e03323e68..5c1efff504b2 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.11 2005/03/29 15:06:05 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.12 2005/04/14 13:41:10 vanquirius Exp $
+
+*pmacct-0.8.4 (14 Apr 2005)
+
+  14 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.8.1.ebuild,
+  -pmacct-0.8.1_p1.ebuild, pmacct-0.8.2.ebuild, +pmacct-0.8.4.ebuild:
+  Removing old versions, marking 0.8.2 x86 stable and adding 0.8.4. The last
+  version now works with gcc-4.
 
 *pmacct-0.8.3 (29 Mar 2005)
 
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index de452b39ad76..e9e9790913fb 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,4 +1,5 @@
 MD5 b8613b9d06df0160d08522355747d1d7 pmacct-0.8.2.ebuild 1496
+MD5 757d501eef9c1594bc047ef6889d0170 pmacct-0.8.4.ebuild 1499
 MD5 be5ecfa971bc928ee905a3faffb90fe0 pmacct-0.8.1_p1.ebuild 1499
 MD5 a34d6900f85eb93b9a115c50de044412 pmacct-0.8.1.ebuild 1455
 MD5 757d501eef9c1594bc047ef6889d0170 pmacct-0.8.3.ebuild 1499
@@ -10,3 +11,4 @@ MD5 ce503fe95e4bfa2d9133e0ba2dffff14 files/digest-pmacct-0.8.1_p1 66
 MD5 5dce1dbfd498a1d586456ba32323c298 files/digest-pmacct-0.8.1 64
 MD5 87abc8e688bb058bd51283670fcfc01a files/digest-pmacct-0.8.2 64
 MD5 ab598b974f8a63136ead320763bf7a5f files/digest-pmacct-0.8.3 64
+MD5 5aada4dc083afac65f161d24379db6fc files/digest-pmacct-0.8.4 64
diff --git a/net-analyzer/pmacct/files/digest-pmacct-0.8.1 b/net-analyzer/pmacct/files/digest-pmacct-0.8.1
deleted file mode 100644
index e416a63298fb..000000000000
--- a/net-analyzer/pmacct/files/digest-pmacct-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d51a0f0ee566665a0b05eb2d42a7f5e pmacct-0.8.1.tar.gz 219669
diff --git a/net-analyzer/pmacct/files/digest-pmacct-0.8.1_p1 b/net-analyzer/pmacct/files/digest-pmacct-0.8.1_p1
deleted file mode 100644
index 9b7bb41ac966..000000000000
--- a/net-analyzer/pmacct/files/digest-pmacct-0.8.1_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 885028e26eefc3dc2bae40395659701a pmacct-0.8.1p1.tar.gz 222371
diff --git a/net-analyzer/pmacct/files/digest-pmacct-0.8.4 b/net-analyzer/pmacct/files/digest-pmacct-0.8.4
new file mode 100644
index 000000000000..6262ffcb2820
--- /dev/null
+++ b/net-analyzer/pmacct/files/digest-pmacct-0.8.4
@@ -0,0 +1 @@
+MD5 3b147f46b7be8e64be5390a8f8aba315 pmacct-0.8.4.tar.gz 235702
diff --git a/net-analyzer/pmacct/pmacct-0.8.1.ebuild b/net-analyzer/pmacct/pmacct-0.8.1.ebuild
deleted file mode 100644
index 146a80eff31f..000000000000
--- a/net-analyzer/pmacct/pmacct-0.8.1.ebuild
+++ /dev/null
@@ -1,52 +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/pmacct/pmacct-0.8.1.ebuild,v 1.3 2005/02/23 10:41:59 ka0ttic Exp $
-
-DESCRIPTION="A network tool to gather ip traffic informations"
-HOMEPAGE="http://www.ba.cnr.it/~paolo/pmacct/"
-SRC_URI="http://www.ba.cnr.it/~paolo/pmacct/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="ipv6 mmap mysql postgres"
-
-RDEPEND="virtual/libpcap
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s|\(CFLAGS=\).*$|\1\"${CFLAGS}\"|g" configure || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable mmap) \
-		$(use_enable ipv6) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README EXAMPLES KNOWN-BUGS CONFIG-KEYS FAQS ChangeLog docs/SIGNALS \
-		docs/PLUGINS docs/INTERNALS TODO TOOLS || die "dodoc failed"
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc ${dirname}/* || die "dodoc ${dirname} failed"
-	done
-
-	newinitd ${FILESDIR}/pmacctd-init.d pmacctd || die "newinitd failed"
-	newconfd ${FILESDIR}/pmacctd-conf.d pmacctd || die "newconfd failed"
-
-	insinto /etc
-	newins ${S}/examples/pmacctd-imt.conf.example pmacctd.conf.example || \
-		die "newins failed"
-}
diff --git a/net-analyzer/pmacct/pmacct-0.8.2.ebuild b/net-analyzer/pmacct/pmacct-0.8.2.ebuild
index 429514a9e3a9..e6fd70f8eff2 100644
--- a/net-analyzer/pmacct/pmacct-0.8.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.8.2.ebuild,v 1.1 2005/03/08 14:28:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.8.2.ebuild,v 1.2 2005/04/14 13:41:11 vanquirius Exp $
 
 MY_P="${P%_*}"
 S="${WORKDIR}/${MY_P}"
@@ -10,7 +10,7 @@ SRC_URI="http://www.ba.cnr.it/~paolo/pmacct/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="ipv6 mmap mysql postgres"
 
 RDEPEND="virtual/libpcap
diff --git a/net-analyzer/pmacct/pmacct-0.8.1_p1.ebuild b/net-analyzer/pmacct/pmacct-0.8.4.ebuild
index 73df5f67d5ff..8c580ca48789 100644
--- a/net-analyzer/pmacct/pmacct-0.8.1_p1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.8.1_p1.ebuild,v 1.1 2005/02/23 10:41:59 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.8.4.ebuild,v 1.1 2005/04/14 13:41:11 vanquirius Exp $
 
 MY_P="${P%_*}"
 S="${WORKDIR}/${MY_P}"