Fix RDEPEND for bug #199216 and remove old

Package-Manager: portage-2.1.4.4

6 files changed, 13 insertions, 125 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index d79714eb6324..ef9c699b5d37 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.51 2008/01/20 19:17:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.52 2008/03/31 17:46:39 cedk Exp $
+
+  31 Mar 2008; Cédric Krier <cedk@gentoo.org> -pmacct-0.9.5.ebuild,
+  -pmacct-0.11.2-r1.ebuild, pmacct-0.11.3.ebuild, pmacct-0.11.4.ebuild:
+  Fix RDEPEND for bug #199216 and remove old
 
   20 Jan 2008; Raúl Porcel <armin76@gentoo.org> pmacct-0.11.4.ebuild:
   x86 stable
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 509568268ed6..57dc7d6e321d 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,12 +1,8 @@
 AUX pmacctd-conf.d 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34
 AUX pmacctd-init.d 658 RMD160 acaae5e5c05408dc49f8f431789c9be9c4b967f8 SHA1 feeaa43694afe3ab6ce10f196892cba822826882 SHA256 41f32bded026e204040a4ba8bf75ed30c564821c67697d6a46a35863fbfbb69b
-DIST pmacct-0.11.2.tar.gz 411711 RMD160 99bead4c09b060854bff72b18ac7150097e78643 SHA1 c66ba52b32d4c7502edc171d4a90dfb34814e174 SHA256 6d8346944c987a2ec9e6b29cbbc2a886007a2535b9d506051ef6afe96faac625
 DIST pmacct-0.11.3.tar.gz 417160 RMD160 b8192ece79b0a1697237700843972bd44f728be0 SHA1 9811465d7820127911df345a94bd7c934d6dad0e SHA256 ff591cb5e1b17ab6f148d10534164307c8f6309b46067bc9be8a32f086a8388d
 DIST pmacct-0.11.4.tar.gz 422189 RMD160 ad8aa10f44ade158435ce81e89e57463b8142bb0 SHA1 c74e4db567e87f845f2118e67b189687bd3544c8 SHA256 34c3870eb2acc63173b95c9a08128592b1ee850dd88e0cbdf2f9e0b9fa3f87c9
-DIST pmacct-0.9.5.tar.gz 304129 RMD160 529af5e3078e7360f6b0226011b354065760d8dd SHA1 34ba2a38440a0b21318a307e40e5e99a566cbc3a SHA256 fd288d73f299852d11d20f2f85340dc878f11360ae0970464f72866162a9d635
-EBUILD pmacct-0.11.2-r1.ebuild 1574 RMD160 6d0f6d8908ecdde68f63348a4d9196b50c307082 SHA1 043b0ee645be5e278adad396db9a5d874d90ced5 SHA256 f6c29ba5dbded5a0367244fa89989fdbf23aab51613b2c84fb4e650e6b39690e
-EBUILD pmacct-0.11.3.ebuild 1575 RMD160 55ac071fb9eba5607831bf30b20767f4425aa80e SHA1 aa9b5177a1e35ba0ecc7536a08494be554dd173b SHA256 d801231dfe31c49c28892282f8e81a2d85e9e2614a85b8bb31b579ad7298f789
-EBUILD pmacct-0.11.4.ebuild 1573 RMD160 681793a49c8b19ae0c452120e0d30653fd97e382 SHA1 bb2f1fe11cfe044d2bb423e9ef9d59f900af4b74 SHA256 a7ede870946b771e0adf04275228a7858ebed2555511c24170fff12964f70ef7
-EBUILD pmacct-0.9.5.ebuild 1560 RMD160 2c82046cfd9af4fa03a1475b261a203e046415dd SHA1 f5c240c2eed25911b3d30ec0ed9f5eff9269c33b SHA256 e74176e8da1d29a58c76fae9e0182ad24788bdeac401ae4c61d72c3011663ec3
-MISC ChangeLog 7977 RMD160 088c479abff9f68f0a39eeeb00fc7ec0d0606ec3 SHA1 8bc105ea54148e9c9ac1b1fdf5d8feb5dcff7a32 SHA256 9efaf01eb003ad83c3a37e96eb765f65871360c045c8795a2de33d3b93021682
+EBUILD pmacct-0.11.3.ebuild 1564 RMD160 13d8791a25ec7d061e5ed442f23b615466d330d6 SHA1 1741b5995eee10305d3fbc43ceebad67ff0dda4c SHA256 b5c6c16659e54768bf1a63767a946e6e4527b93c10c9466d507aad1d3711f893
+EBUILD pmacct-0.11.4.ebuild 1565 RMD160 1e5e41f8b644f6413dd030629457e8b35bdb9fb1 SHA1 a05214115bc0009f0168552a77bcdf6b09b3f5db SHA256 f8b4308c42b247b7f0d5b5fb76caaba571ab1c69e91a8be280d10c760ffde140
+MISC ChangeLog 8161 RMD160 28296eb5e8ea773551fba4679fbf39c698fc3c7f SHA1 854e13cad252d9748953cc7e77970c56929e71a0 SHA256 50d0941e1c5f775a55018dd2c0914af4a36043d42f85947a898b2632de4e12dd
 MISC metadata.xml 243 RMD160 0fd9040526fc868cc4340ad66be2d69df7d829d6 SHA1 4c7c900b208f9f6ac207623cd58132d9df589f90 SHA256 49325dc5114ba3e0a5fa5dda3ddd35a605256831212338ae5ea47523f4593bb5
diff --git a/net-analyzer/pmacct/pmacct-0.11.2-r1.ebuild b/net-analyzer/pmacct/pmacct-0.11.2-r1.ebuild
deleted file mode 100644
index 0f44be69904b..000000000000
--- a/net-analyzer/pmacct/pmacct-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.2-r1.ebuild,v 1.1 2007/01/15 22:00:38 cedk Exp $
-
-DESCRIPTION="A network tool to gather ip traffic informations"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
-
-RDEPEND="net-libs/libpcap
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite3? ( =dev-db/sqlite-3* )"
-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) \
-		$(use_enable debug) \
-		$(use_enable 64bit) \
-		$(use_enable sqlite3) \
-		|| 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.11.3.ebuild b/net-analyzer/pmacct/pmacct-0.11.3.ebuild
index 2a781a7fdbde..e8ae1dce1056 100644
--- a/net-analyzer/pmacct/pmacct-0.11.3.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.11.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.3.ebuild,v 1.3 2007/08/13 21:24:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.3.ebuild,v 1.4 2008/03/31 17:46:39 cedk Exp $
 
 DESCRIPTION="A network tool to gather ip traffic informations"
 HOMEPAGE="http://www.pmacct.net/"
@@ -13,7 +13,7 @@ IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
 
 RDEPEND="net-libs/libpcap
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/libpq )
 	sqlite3? ( =dev-db/sqlite-3* )"
 DEPEND="${RDEPEND}"
 
diff --git a/net-analyzer/pmacct/pmacct-0.11.4.ebuild b/net-analyzer/pmacct/pmacct-0.11.4.ebuild
index ba0a7b3870e9..3bdb22c842c5 100644
--- a/net-analyzer/pmacct/pmacct-0.11.4.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.11.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.4.ebuild,v 1.2 2008/01/20 19:17:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.4.ebuild,v 1.3 2008/03/31 17:46:39 cedk Exp $
 
 DESCRIPTION="A network tool to gather ip traffic informations"
 HOMEPAGE="http://www.pmacct.net/"
@@ -13,7 +13,7 @@ IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
 
 RDEPEND="net-libs/libpcap
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/libpq )
 	sqlite3? ( =dev-db/sqlite-3* )"
 DEPEND="${RDEPEND}"
 
diff --git a/net-analyzer/pmacct/pmacct-0.9.5.ebuild b/net-analyzer/pmacct/pmacct-0.9.5.ebuild
deleted file mode 100644
index d9535725e98a..000000000000
--- a/net-analyzer/pmacct/pmacct-0.9.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.9.5.ebuild,v 1.5 2006/11/23 19:52:40 vivo Exp $
-
-MY_P="${P%_*}"
-S="${WORKDIR}/${MY_P}"
-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="~amd64 ppc x86"
-IUSE="64bit debug ipv6 mmap mysql postgres"
-
-RDEPEND="net-libs/libpcap
-	mysql? ( virtual/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) \
-		$(use_enable debug) \
-		$(use_enable 64bit) \
-		|| 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"
-}