Version bump.

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

5 files changed, 31 insertions, 98 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 2eb0556a16f1..2a047ccc8afe 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/pmacct
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.86 2012/11/20 20:10:51 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.87 2013/01/21 21:07:39 jer Exp $
+
+*pmacct-0.14.2 (21 Jan 2013)
+
+  21 Jan 2013; Jeroen Roovers <jer@gentoo.org> -pmacct-0.12.5-r1.ebuild,
+  -files/pmacct-0.12.5-sin6_addr.patch, -pmacct-0.14.0.ebuild,
+  +pmacct-0.14.2.ebuild, metadata.xml:
+  Version bump.
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pmacct-0.14.1.ebuild:
   Stable for x86, wrt bug #441430
diff --git a/net-analyzer/pmacct/files/pmacct-0.12.5-sin6_addr.patch b/net-analyzer/pmacct/files/pmacct-0.12.5-sin6_addr.patch
deleted file mode 100644
index 4c81beae4236..000000000000
--- a/net-analyzer/pmacct/files/pmacct-0.12.5-sin6_addr.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/bgp/bgp.c	2010-12-21 17:56:52.000000000 +0100
-+++ b/src/bgp/bgp.c	2010-12-29 17:44:43.000000000 +0100
-@@ -1782,7 +1782,7 @@
-               sa = &sa_local;
-               memset(sa, 0, sizeof(struct sockaddr));
-               sa->sa_family = AF_INET6;
--              memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, 16);
-+              memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, sizeof(&((struct sockaddr_in6 *)sa)->sin6_addr));
-               goto start_again;
-             }
- #endif
-@@ -1911,7 +1911,7 @@
-           pptrs->f_agent = (char *) &sa_local;
-           memset(sa, 0, sizeof(struct sockaddr));
-           sa->sa_family = AF_INET6;
--          memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, 16);
-+          memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, sizeof(&((struct sockaddr_in6 *)sa)->sin6_addr));
- 	  saved_info = (char *) info;
- 	  ttl--;
-           goto start_again;
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index 9acd982defee..aa97dae02372 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -5,6 +5,7 @@
 <longdescription>A network tool to gather IP traffic information</longdescription>
 <use>
   <flag name='64bit'>Use 64bit counters instead of 32bit ones</flag>
+  <flag name='mongodb'>Add support for mongodb backend</flag>
   <flag name='ulog'>Enable ULOG support</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild b/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild
deleted file mode 100644
index 76e0c3c42e4b..000000000000
--- a/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild,v 1.4 2012/04/16 21:16:22 ranger Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-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 mysql postgres sqlite threads ulog"
-
-RDEPEND="net-libs/libpcap
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( =dev-db/sqlite-3* )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.12.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-0.12.5-sin6_addr.patch
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(use_enable ulog) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog CONFIG-KEYS EXAMPLES FAQS KNOWN-BUGS README UPGRADE \
-		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"
-
-	mkdir -p "${D}"/etc/pmacctd
-	insinto /etc/pmacctd
-	newins "${S}/examples/pmacctd-imt.conf.example" pmacctd.conf || \
-		die "newins failed"
-}
diff --git a/net-analyzer/pmacct/pmacct-0.14.0.ebuild b/net-analyzer/pmacct/pmacct-0.14.2.ebuild
index fea3fd2bbc78..aa80ae680ffb 100644
--- a/net-analyzer/pmacct/pmacct-0.14.0.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.14.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.14.0.ebuild,v 1.1 2012/04/13 15:22:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.14.2.ebuild,v 1.1 2013/01/21 21:07:39 jer Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -11,37 +11,44 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug ipv6 mysql postgres sqlite threads ulog"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
 
-RDEPEND="net-libs/libpcap
+DEPEND="
+	net-libs/libpcap
+	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
-	sqlite? ( =dev-db/sqlite-3* )"
-DEPEND="${RDEPEND}"
+	sqlite? ( =dev-db/sqlite-3* )
+"
+RDEPEND="${DEPEND}"
+
 DOCS=(
-	CONFIG-KEYS ChangeLog EXAMPLES FAQS KNOWN-BUGS README TODO TOOLS UPGRADE
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS README TODO TOOLS UPGRADE
 	docs/INTERNALS docs/PLUGINS docs/SIGNALS
 )
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.12.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-0.12.5-sin6_addr.patch
+	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
+	sed -i \
+		-e '/[[:space:]]ar /s|ar |$(AR) |g' \
+		$(find . -name Makefile.in) || die
 }
 
 src_configure() {
-	tc-export CC
+	tc-export CC AR RANLIB
+
 	econf \
 		$(use_enable 64bit) \
 		$(use_enable debug) \
+		$(use_enable geoip) \
 		$(use_enable ipv6) \
+		$(use_enable mongodb) \
 		$(use_enable mysql) \
 		$(use_enable postgres pgsql) \
 		$(use_enable sqlite sqlite3) \
 		$(use_enable threads) \
-		$(use_enable ulog) \
-		|| die "econf failed"
+		$(use_enable ulog)
 }
 
 src_install() {