Use pkg-config instead of glib-config. Fix parallel make. Respect LDFLAGS (bug #336570) and CC.

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

4 files changed, 135 insertions, 26 deletions

diff --git a/net-analyzer/traffic-vis/ChangeLog b/net-analyzer/traffic-vis/ChangeLog
index 67c04117d97e..b32bb1d39f3c 100644
--- a/net-analyzer/traffic-vis/ChangeLog
+++ b/net-analyzer/traffic-vis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/traffic-vis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.18 2009/12/26 17:40:55 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.19 2010/09/10 05:14:31 jer Exp $
+
+*traffic-vis-0.35-r2 (10 Sep 2010)
+
+  10 Sep 2010; Jeroen Roovers <jer@gentoo.org> +traffic-vis-0.35-r2.ebuild,
+  files/traffic-vis-0.35-gentoo.patch:
+  Use pkg-config instead of glib-config. Fix parallel make. Respect LDFLAGS
+  (bug #336570) and CC.
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> traffic-vis-0.35-r1.ebuild:
   virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only
diff --git a/net-analyzer/traffic-vis/Manifest b/net-analyzer/traffic-vis/Manifest
index 6c26299fe482..31a70315232c 100644
--- a/net-analyzer/traffic-vis/Manifest
+++ b/net-analyzer/traffic-vis/Manifest
@@ -1,8 +1,9 @@
-AUX traffic-vis-0.35-gentoo.patch 3759 RMD160 0517a3dc5c2bb69eeec299aa4ef2a1192783669d SHA1 29088d131c3f4844126e05a1561e3fc4d1759fca SHA256 c0c2463e8d75b41b7458af930c91f3af4a1d668b67d345bbe118e658bb2f4710
+AUX traffic-vis-0.35-gentoo.patch 5377 RMD160 08c60df9431b1f4ed4119865d063fefa6984af36 SHA1 2efffeb2fd8058088dbf9eb92f842db3cc5c1408 SHA256 7104cc67000394f871cd8072c79bcf38627e6180b161ab25701d6944f8ade3dd
 AUX traffic-vis-0.35-libpcap-header-fix.patch 280 RMD160 04e7d8534600aa935f3d0aaff1f13c4933baad43 SHA1 f6fed7649faf6f4b3d5c763bc1e0af9b2f4be0d7 SHA256 b63d12f2105b2d031635871397e72c6de09c12d7edd92bbf4758556082ebc4c0
 AUX traffic-vis.conf.d 365 RMD160 affed99857725e3e5994c20e8860ffec9f2259ae SHA1 e6487b41df460497ebea6df94cb7382c24308d0f SHA256 fdaaef2191bd56f47a5ed3bfe078871b178ea310923a49d84e4eabadeeefce41
 AUX traffic-vis.init.d 744 RMD160 f654592da8969603ae67437bc208a5d52e92470a SHA1 76c307a171bc2c1df72d4e89eb979777ea0c653d SHA256 57d1281c8174a0262d927056a3760ac877c6817c2ce8befe25a0f5a8653cf3db
 DIST traffic-vis-0.35.tar.gz 41202 RMD160 763e0f4532628d68325e933a9963d8435ae95a6b SHA1 762c9d956bdd075fef567570ad10d54a393d7d2c SHA256 8a6d56a390df525c73ac35f7c4a2ac854072824ee36fb2053b35fdf14e933754
 EBUILD traffic-vis-0.35-r1.ebuild 1448 RMD160 149e5768167e3528b7c436cd6dcca373f3be4a26 SHA1 437c76054d5b617cd7283c26dae82ea25c65f42c SHA256 a0869800318d1f490a5559bd7132619b565d7a7430e2043fb3e26b6b00233184
-MISC ChangeLog 2516 RMD160 90a58c48789a79e33a05bb5bf57c87b44821279d SHA1 71ddcff4eebac1af41cde8bba37ae6598e6bce8b SHA256 a6e518510822c6f05e4b3ada9e3f050cf59d64389769eec6e21332eb451df18c
+EBUILD traffic-vis-0.35-r2.ebuild 1455 RMD160 d2bd164c35c0ffaa31848578fd4a92a7fee09de6 SHA1 fb9960b6fa2c125a6fa72cb0dcdd0531d78b9d0f SHA256 fb0e1559b65b517042d084c412efb1772bdeec2883b9a773c25e446b1b11eba7
+MISC ChangeLog 2768 RMD160 eb62e7240d9674fabc43d772fb29f1eb5db2239b SHA1 c29b07a85b230a8e758493e19d40e1576946224e SHA256 730f08526de567ba1534ddc4c64a7025648973e0a18e8118738e30e51b261154
 MISC metadata.xml 250 RMD160 8243f369f9fceba6f1e62bf8a17853094de6738e SHA1 3c65215346e5477e7bd5d37503890daa9f0e77c6 SHA256 8f64428f5a200994e8520ffe481dfb1fba11bee5da6a46ba8f283062fba4b2b0
diff --git a/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch b/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch
index 9b0e076d4ec8..23dd7f4f4add 100644
--- a/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch
+++ b/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch
@@ -1,5 +1,5 @@
---- frontends/htmlfe.c
-+++ frontends/htmlfe.c	2003-06-20 07:07:17.000000000 +0000
+--- a/frontends/htmlfe.c
++++ b/frontends/htmlfe.c
 @@ -188,7 +188,7 @@
  										<TD ALIGN=\"RIGHT\">\n\
  											%llu\n\
@@ -9,8 +9,8 @@
  ", host->bytes_sent, host->bytes_received);
  
  	fprintf(out, "\
---- frontends/traffic-togif
-+++ frontends/traffic-togif	2003-10-23 19:29:30.000000000 +0000
+--- a/frontends/traffic-togif
++++ b/frontends/traffic-togif
 @@ -31,7 +31,7 @@
  my $y_size = 750;
  
@@ -20,8 +20,50 @@
  my $pnmcrop = "/usr/bin/pnmcrop";
  my $pnmscale = "/usr/bin/pnmscale";
  my $ppmtogif = "/usr/bin/ppmtogif";
---- collector/Makefile
-+++ collector/Makefile	2003-10-23 19:45:52.000000000 +0000
+--- a/Makefile	2003-06-20 09:07:17.000000000 +0200
++++ b/Makefile	2010-09-10 06:53:46.000000000 +0200
+@@ -7,11 +7,11 @@
+ OPT_FLAGS=$(RPM_OPT_FLAGS)
+ WARNFLAGS=-Wall -Wno-conversion -Waggregate-return -Wmissing-prototypes -Wstrict-prototypes 
+ DEBUGFLAGS=-g #-DDEBUG
+-INCLUDES=-I/usr/include/pcap `glib-config --cflags`
++INCLUDES=-I/usr/include/pcap `pkg-config --cflags glib-2.0`
+ DEFINES= -DHAVE_GETOPT_LONG
+ CFLAGS+= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) $(OPT_FLAGS)
+ LFLAGS=
+-GLIB=`glib-config --libs`
++GLIB=`pkg-config --libs glib-2.0`
+ #GLIB=/usr/lib/libglib.a
+ #DEBUGLIBS=-lefence
+ 
+@@ -25,7 +25,7 @@
+ all: $(TARGETS) 
+ 	for x in $(SUBDIRS) ; \
+ 	do \
+-		make -C $$x \
++		$(MAKE) -C $$x \
+ 			VERSION="$(VERSION)" OPT_FLAGS="$(OPT_FLAGS)" \
+ 			WARNFLAGS="$(WARNFLAGS)" INCLUDES="$(INCLUDES)" \
+ 			DEFINES="$(DEFINES)" GLIB="$(GLIB)" \
+@@ -38,7 +38,7 @@
+ install:
+ 	for x in $(SUBDIRS) ; \
+ 	do \
+-		make -C $$x SBINDIR="$(SBINDIR)" MANDIR="$(MANDIR)" install || exit 1; \
++		$(MAKE) -C $$x SBINDIR="$(SBINDIR)" MANDIR="$(MANDIR)" install || exit 1; \
+ 	done
+ 	install -m 644 -o root -g root traffic-vis.8 $(MANDIR)/man8/
+ 
+@@ -46,6 +46,6 @@
+ 	rm -f *.o core ~* *.a *.ps *.txt *.html test test.o *.tv
+ 	for x in $(SUBDIRS) ; \
+ 	do \
+-		(cd $$x && make clean && cd ..) ; \
++		(cd $$x && $(MAKE) clean && cd ..) ; \
+ 	done
+ 
+--- a/collector/Makefile	1999-02-11 04:23:50.000000000 +0100
++++ b/collector/Makefile	2010-09-10 06:53:46.000000000 +0200
 @@ -1,4 +1,4 @@
 -CFLAGS= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
 +CFLAGS+= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
@@ -33,12 +75,12 @@
  
  traffic-collector: traffic-collector.o $(OBJS)
 -	$(CC) -o $@ traffic-collector.o $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ traffic-collector.o $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-collector.o $(OBJS) $(LIBS)
  
  install:
  	install -m 750 -o root -g root traffic-collector $(SBINDIR)
---- frontends/Makefile
-+++ frontends/Makefile	2003-10-23 19:48:02.000000000 +0000
+--- a/frontends/Makefile	1999-02-11 04:23:50.000000000 +0100
++++ b/frontends/Makefile	2010-09-10 06:53:46.000000000 +0200
 @@ -1,4 +1,4 @@
 -CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
 +CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
@@ -50,37 +92,40 @@
  
  traffic-tops: traffic-tops.o psfe.o ../libreport.a
 -	$(CC) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm
-+	$(CC) $(CFLAGS) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm
  
  traffic-totext: traffic-totext.o textfe.o ../libreport.a
 -	$(CC) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS)
  
  traffic-tohtml: traffic-tohtml.o htmlfe.o ../libreport.a
 -	$(CC) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS)
  
  install:
  	install -m 755 -o root -g root traffic-tops $(SBINDIR)
---- sort/Makefile
-+++ sort/Makefile	2003-10-23 19:49:11.000000000 +0000
-@@ -1,4 +1,4 @@
+--- a/sort/Makefile	1999-02-11 04:23:50.000000000 +0100
++++ b/sort/Makefile	2010-09-10 06:56:39.000000000 +0200
+@@ -1,13 +1,13 @@
 -CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
 +CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
  OBJS=
  TARGETS=traffic-sort
- LFLAGS=-L..
-@@ -7,7 +7,7 @@
+-LFLAGS=-L..
+-LIBS=-lreport $(GLIB) $(DEBUGLIBS)
++LFLAGS=
++LIBS=-L.. -lreport $(GLIB) $(DEBUGLIBS)
+ 
  all: $(TARGETS)
  
  traffic-sort: traffic-sort.o ../libreport.a
 -	$(CC) $(LFLAGS) -o $@ traffic-sort.o $(LIBS)
-+	$(CC) $(CFLAGS) $(LFLAGS) -o $@ traffic-sort.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ traffic-sort.o $(LIBS)
  
  install:
  	install -m 755 -o root -g root traffic-sort $(SBINDIR)
---- utils/Makefile
-+++ utils/Makefile	2003-10-23 19:50:48.000000000 +0000
+--- a/utils/Makefile	1999-02-11 04:23:50.000000000 +0100
++++ b/utils/Makefile	2010-09-10 06:53:46.000000000 +0200
 @@ -1,4 +1,4 @@
 -CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
 +CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
@@ -92,11 +137,11 @@
  
  traffic-exclude: traffic-exclude.o ../libreport.a
 -	$(CC) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS)
  
  traffic-resolve: traffic-resolve.o ../libreport.a
 -	$(CC) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS)
  
  install:
  	install -m 755 -o root -g root traffic-resolve $(SBINDIR)
diff --git a/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild b/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild
new file mode 100644
index 000000000000..412ed683bb33
--- /dev/null
+++ b/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35-r2.ebuild,v 1.1 2010/09/10 05:14:31 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Generate traffic stats in html, ps, text and gif format"
+HOMEPAGE="http://www.mindrot.org/traffic-vis.html"
+SRC_URI="http://www.mindrot.org/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="gif"
+DEPEND="net-libs/libpcap
+	gif? ( media-libs/netpbm
+		app-text/ghostscript-gpl
+		dev-lang/perl )
+	=dev-libs/glib-1.2*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-libpcap-header-fix.patch
+
+	# bug 143930 - traffic-vis expects /usr/sbin/traffic-tops
+	sed -i frontends/traffic-togif \
+		-e "s:/usr/sbin/traffic-tops:/usr/bin/traffic-tops:g" \
+		|| die "sed frontends/traffic-togif"
+	
+	tc-export CC
+}
+
+src_install() {
+	dosbin collector/traffic-collector
+	doman collector/traffic-collector.8
+
+	for mybin in $(useq gif && echo frontends/traffic-togif) \
+			frontends/traffic-tohtml \
+			frontends/traffic-tops \
+			frontends/traffic-totext \
+			sort/traffic-sort \
+			utils/traffic-exclude \
+			utils/traffic-resolve ; do
+
+		dobin ${mybin}
+		doman ${mybin}.8
+	done
+
+	newinitd "${FILESDIR}"/traffic-vis.init.d traffic-vis
+	newconfd "${FILESDIR}"/traffic-vis.conf.d traffic-vis
+
+	dodoc TODO README BUGS CHANGELOG
+}