Remove IUSE=mmap. Add IUSE="threads ulog" thanks to Marcin Mirosław (bug #306641). Replace broken sed script with something that both respects CFLAGS and does not remove vital -DEFINES. Install UPGRADE doc.

Package-Manager: portage-2.2_rc63/cvs/Linux i686

5 files changed, 51 insertions, 17 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index e24a8ac84664..21bff072ba38 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.62 2010/02/23 16:01:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.63 2010/02/25 22:22:57 jer Exp $
+
+  25 Feb 2010; Jeroen Roovers <jer@gentoo.org> pmacct-0.12.0.ebuild,
+  +files/pmacct-0.12.0-gentoo.patch, metadata.xml:
+  Remove IUSE=mmap. Add IUSE="threads ulog" thanks to Marcin Mirosław (bug
+  #306641). Replace broken sed script with something that both respects
+  CFLAGS and does not remove vital -DEFINES. Install UPGRADE doc. 
 
 *pmacct-0.12.0 (23 Feb 2010)
 
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 4004aa868db5..bbcf6cc36e43 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,8 +1,9 @@
+AUX pmacct-0.12.0-gentoo.patch 780 RMD160 8711c74fa0bdf3c7c2c9cf45094453a659947dd0 SHA1 6889640809c1b0d66c1cccceb29ed4f82db72ae5 SHA256 a0f2205b7106cf813cfdb0106e2e3db5e28bfb35506b0dbac13cceb26c74054a
 AUX pmacctd-conf.d 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34
 AUX pmacctd-init.d 744 RMD160 7c8fb28b0c7cc86c293991e8ec1829e445308bcf SHA1 ce129b23c4c29142bfc699bac8215928e930d096 SHA256 a22eeebab95ea1fea2c518a0d8835894487bf6b80c20d4613688bc8e3958dec8
 DIST pmacct-0.11.5.tar.gz 423251 RMD160 4f54c8102bc1a759beddf749667839d420783767 SHA1 f4ca3086153094a1335d059b0aee9015f0079bf9 SHA256 d26b98e8a8cb670222983df46746d860e27beca032b5feff6439c3f3c0aad752
 DIST pmacct-0.12.0.tar.gz 523032 RMD160 f2ea296ec21929094235f6877ec1be32f15cba5d SHA1 6502ac135d84ed30173c9a0acbdc8772505f9246 SHA256 4a3543597ca107cadf50a7fc4bfe0d3ed9ab4fdd17de01bce98132289a427cd0
 EBUILD pmacct-0.11.5-r1.ebuild 1547 RMD160 39f7b97b46a50725f38600d63250082c9d067b9f SHA1 12708e1c5d270049d80bc0de20c3b3545d414b3c SHA256 40b28c62955a0582564e843cbbc6df5f61e2c8d37a8c815cfc8e7f21ee0a28bb
-EBUILD pmacct-0.12.0.ebuild 1545 RMD160 8057d29964cfc0e8c2177dd311a6b01985d84abd SHA1 6ea5ccb3a0ec666edb9a6d794030db60a185e076 SHA256 d3cff6c721baae4196bf6beef81f352841d5a866259b35c2a192f3ba0ce92150
-MISC ChangeLog 9688 RMD160 64682e24a3e681349f3fb1601af9f7994304bdd0 SHA1 4a8b9db562f183077059ad158e5ee0228f03db58 SHA256 adcb86326fadb1b8bccb124bbeb5fb764fc90c8513911571b92c85f6951ac6db
-MISC metadata.xml 321 RMD160 db50b95ceeb1cf11fb46bc79f4088b8a1b114eb3 SHA1 6d3bf2118fc41e53f45dfb5d4d6e09ce4f1e1dee SHA256 082a069e7b8707764fd7e8bd5e42efcc20c88b471d4cdf7ac3aec87d7ecb766a
+EBUILD pmacct-0.12.0.ebuild 1610 RMD160 4e4239ba2251c3fc587517953506bab4a8066e5a SHA1 2411dd6cce83f56d24c46a30b8e3c3d75fc1bdd5 SHA256 6969cd417c3670f4153d1fe9bc5ccf7784e5fc346ac751bcd249ce060f3cbf29
+MISC ChangeLog 10024 RMD160 2c7703b7fbe8c1e3258b3daa07a7fe63d0542e9a SHA1 0d7ecd9f9ddbd2411ea4ec3d3adafbd4e328530e SHA256 c7f999647d11d3d323f23cffd5bbbe8d95004c452049229657a59a19bd86997c
+MISC metadata.xml 372 RMD160 1bab87a692e77b8e8e12bfd47f0db1aac5a76168 SHA1 c4a31334d73bd8f0f2785db76844e08c8d6ceeb8 SHA256 db6afbab5c0bf494f40313b04f765059a286260c39de873bde101d41038b9fd0
diff --git a/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch b/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch
new file mode 100644
index 000000000000..a367d98ceb6a
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch
@@ -0,0 +1,20 @@
+--- configure.org	2010-02-16 13:06:04.000000000 +0100
++++ configure	2010-02-25 22:57:08.000000000 +0100
+@@ -1103,7 +1103,7 @@
+ echo $ac_n "checking whether to enable debugging compiler options""... $ac_c" 1>&6
+ echo "configure:1105: checking whether to enable debugging compiler options" >&5
+ # Check whether --enable-debug or --disable-debug was given.
+-if test "${enable_debug+set}" = set; then
++if test "${enable_debug+set}" = TODO_THIS_WILL_NEVER_BE_TRUE; then
+   enableval="$enable_debug"
+   echo "$ac_t""yes" 1>&6
+ 	tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'`
+@@ -1114,7 +1114,7 @@
+   	#CFLAGS="$CFLAGS -Wcast-align -Wcast-qual -Wnested-externs"
+   	#CFLAGS="$CFLAGS -Wshadow -Wbad-function-cast -Wwrite-strings"
+ 	echo "$ac_t""no" 1>&6
+-
++	CFLAGS="$ac_save_CFLAGS"
+ fi
+ 
+ 
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index 11fd26cae895..14e80e44aab4 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -3,5 +3,8 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <longdescription>A network tool to gather ip traffic informations</longdescription>
-<use><flag name='64bit'>Use 64bit counters instead of 32bit ones</flag></use>
+<use>
+  <flag name='64bit'>Use 64bit counters instead of 32bit ones</flag>
+  <flag name='ulog'>Enable ULOG support</flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-0.12.0.ebuild b/net-analyzer/pmacct/pmacct-0.12.0.ebuild
index 5380e1d65040..e77c3586dc8a 100644
--- a/net-analyzer/pmacct/pmacct-0.12.0.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.12.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0.ebuild,v 1.1 2010/02/23 16:01:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0.ebuild,v 1.2 2010/02/25 22:22:57 jer Exp $
 
 EAPI="2"
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A network tool to gather ip traffic informations"
 HOMEPAGE="http://www.pmacct.net/"
@@ -13,7 +13,7 @@ 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 sqlite"
+IUSE="64bit debug ipv6 mysql postgres sqlite threads ulog"
 
 RDEPEND="net-libs/libpcap
 	mysql? ( virtual/mysql )
@@ -22,25 +22,29 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i "s|\(CFLAGS=\).*$|\1\"${CFLAGS}\"|g" configure || die "sed failed"
+	cp -av configure{,.org}
+	cp -av configure.in{,.org}
+	epatch "${FILESDIR}"/${P}-gentoo.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 mmap) \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		$(use_enable 64bit) \
-		$(use_enable sqlite sqlite3)
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		|| die "econf 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"
+	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}