[gentoo-commits] gentoo-x86 commit in net-analyzer/pmacct: metadata.xml ChangeLog pmacct-0.12.0.ebuild

[Jeroen Roovers (jer)]

jer         10/02/25 22:22:58

  Modified:             metadata.xml ChangeLog pmacct-0.12.0.ebuild
  Log:
  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.
  (Portage version: 2.2_rc63/cvs/Linux i686)

Revision  Changes    Path
1.3                  net-analyzer/pmacct/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	4 Aug 2008 19:50:44 -0000	1.2
+++ metadata.xml	25 Feb 2010 22:22:57 -0000	1.3
@@ -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>



1.63                 net-analyzer/pmacct/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/ChangeLog?r1=1.62&r2=1.63

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog	23 Feb 2010 16:01:17 -0000	1.62
+++ ChangeLog	25 Feb 2010 22:22:57 -0000	1.63
@@ -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@g.o> 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)
 



1.2                  net-analyzer/pmacct/pmacct-0.12.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0.ebuild?r1=1.1&r2=1.2

Index: pmacct-0.12.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pmacct-0.12.0.ebuild	23 Feb 2010 16:01:17 -0000	1.1
+++ pmacct-0.12.0.ebuild	25 Feb 2010 22:22:57 -0000	1.2
@@ -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 @@
 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 @@
 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}