sqlite3 USE flag renamed to sqlite, bug #251395, thank Henrique Rodrigues for report.

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 22 insertions, 73 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 53c72057b810..44e66e22a60a 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,11 @@
 # 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.56 2008/11/16 16:00:25 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.57 2009/05/24 19:11:20 pva Exp $
+
+  24 May 2009; Peter Volkov <pva@gentoo.org> pmacct-0.11.3.ebuild,
+  pmacct-0.11.4.ebuild, -pmacct-0.11.5.ebuild, pmacct-0.11.5-r1.ebuild:
+  sqlite3 USE flag renamed to sqlite, bug #251395, thank Henrique Rodrigues
+  for report.
 
 *pmacct-0.11.5-r1 (16 Nov 2008)
 
diff --git a/net-analyzer/pmacct/pmacct-0.11.3.ebuild b/net-analyzer/pmacct/pmacct-0.11.3.ebuild
index 9e5447feabca..f7d83240c4f4 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.5 2008/05/19 20:10:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.3.ebuild,v 1.6 2009/05/24 19:11:20 pva Exp $
 
 DESCRIPTION="A network tool to gather ip traffic informations"
 HOMEPAGE="http://www.pmacct.net/"
@@ -9,12 +9,12 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
+IUSE="64bit debug ipv6 mmap mysql postgres sqlite"
 
 RDEPEND="net-libs/libpcap
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-base )
-	sqlite3? ( =dev-db/sqlite-3* )"
+	sqlite? ( =dev-db/sqlite-3* )"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -31,7 +31,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_enable debug) \
 		$(use_enable 64bit) \
-		$(use_enable sqlite3) \
+		$(use_enable sqlite sqlite3) \
 		|| die "econf failed"
 
 	emake || die "emake failed"
diff --git a/net-analyzer/pmacct/pmacct-0.11.4.ebuild b/net-analyzer/pmacct/pmacct-0.11.4.ebuild
index c88f0fccd110..605436ae7e6d 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
+# Copyright 1999-2009 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.4 2008/05/19 20:10:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.4.ebuild,v 1.5 2009/05/24 19:11:20 pva Exp $
 
 DESCRIPTION="A network tool to gather ip traffic informations"
 HOMEPAGE="http://www.pmacct.net/"
@@ -9,12 +9,12 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
+IUSE="64bit debug ipv6 mmap mysql postgres sqlite"
 
 RDEPEND="net-libs/libpcap
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-base )
-	sqlite3? ( =dev-db/sqlite-3* )"
+	sqlite? ( =dev-db/sqlite-3* )"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -31,7 +31,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_enable debug) \
 		$(use_enable 64bit) \
-		$(use_enable sqlite3) \
+		$(use_enable sqlite sqlite3) \
 		|| die "econf failed"
 
 	emake || die "emake failed"
diff --git a/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild b/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild
index 7687db374583..71de9f974e35 100644
--- a/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild,v 1.1 2008/11/16 16:00:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild,v 1.2 2009/05/24 19:11:20 pva Exp $
 
 DESCRIPTION="A network tool to gather ip traffic informations"
 HOMEPAGE="http://www.pmacct.net/"
@@ -9,12 +9,12 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
+IUSE="64bit debug ipv6 mmap mysql postgres sqlite"
 
 RDEPEND="net-libs/libpcap
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-base )
-	sqlite3? ( =dev-db/sqlite-3* )"
+	sqlite? ( =dev-db/sqlite-3* )"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -31,7 +31,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_enable debug) \
 		$(use_enable 64bit) \
-		$(use_enable sqlite3)
+		$(use_enable sqlite sqlite3)
 
 	emake || die "emake failed"
 }
diff --git a/net-analyzer/pmacct/pmacct-0.11.5.ebuild b/net-analyzer/pmacct/pmacct-0.11.5.ebuild
deleted file mode 100644
index 3c85d62b1db5..000000000000
--- a/net-analyzer/pmacct/pmacct-0.11.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.5.ebuild,v 1.1 2008/07/26 11:29:44 dertobi123 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="~amd64 ~ppc ~x86"
-IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
-
-RDEPEND="net-libs/libpcap
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-base )
-	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"
-}