Version bump.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

6 files changed, 134 insertions, 94 deletions

diff --git a/net-analyzer/nethogs/ChangeLog b/net-analyzer/nethogs/ChangeLog
index e00c193d8c40..e3db60b06c33 100644
--- a/net-analyzer/nethogs/ChangeLog
+++ b/net-analyzer/nethogs/ChangeLog
@@ -1,16 +1,23 @@
 # ChangeLog for net-analyzer/nethogs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.12 2008/12/10 22:44:15 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.13 2009/04/29 06:50:47 ssuominen Exp $
+
+*nethogs-0.7.0 (29 Apr 2009)
+
+  29 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> -nethogs-0.6.0.ebuild,
+  -files/nethogs-0.6.0-gcc34.diff, +nethogs-0.7.0.ebuild,
+  +files/nethogs-0.7.0-Makefile.patch:
+  Version bump.
 
   10 Dec 2008; Markus Meier <maekke@gentoo.org> nethogs-0.6.1_pre2.ebuild:
   amd64/x86 stable, bug #249898
 
 *nethogs-0.6.1_pre2 (05 Dec 2008)
 
-  05 Dec 2008; <ssuominen@gentoo.org> +files/nethogs-0.6.1_pre2-gcc43.patch,
-  +nethogs-0.6.1_pre2.ebuild:
-  Version bump with GCC 4.3 and GLIBC 2.8 patch wrt #249898, partly thanks
-  to Pro <hyrurg at gmail.com>
+  05 Dec 2008; Samuli Suominen <ssuominen@gentoo.org>
+  +files/nethogs-0.6.1_pre2-gcc43.patch, +nethogs-0.6.1_pre2.ebuild:
+  Version bump with GCC 4.3 and GLIBC 2.8 patch wrt #249898, thanks to
+  Pro <hyrurg at gmail.com>
 
   12 Apr 2007; <welp@gentoo.org> nethogs-0.6.0.ebuild:
   Stable on amd64
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 9b25ddfcf3d7..8f16768b298a 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX nethogs-0.6.0-gcc34.diff 397 RMD160 75dfa5acb77592014d7c5d6e5eb729399d908f10 SHA1 5bb3bc2fd2499e82249b77f7a4f6adb691e82f4b SHA256 0f257741b696c8b952fa555787b0c42c7abf8c69416af0eed0486ebf12e418f9
 AUX nethogs-0.6.1_pre2-gcc43.patch 936 RMD160 807eab01c9e123b9c9caf09ea9190a823a5ae597 SHA1 0f8d7655e7c9a0d574e99fba459293acd530fd85 SHA256 7d3248790a6f453ca9e32bf4cb3650d3899f4f7ee62112f360930e375ffc4326
-DIST nethogs-0.6.0.tar.gz 19510 RMD160 c5f4d96498b2de8f88ae369a424c605975e839e1 SHA1 7b2b6bcd342a30a67f5dc57d867f078889cf8e4f SHA256 894cc2626d3bcf7aa73d100a857be36f185b1075f43f098c4bba6b4ee784c590
+AUX nethogs-0.7.0-Makefile.patch 3267 RMD160 fd6695ef6ebdd265a8982b51865e3f046f581d9e SHA1 4588cf81b9bb1beff46da94085385cda18a41583 SHA256 ed09668778f0f981ac1fce4cc523db853759ec7a6f8cfc6b19c1b413cbc4fe6a
 DIST nethogs-0.6.1-pre2.tar.gz 31755 RMD160 e5fe79222e1883923a53fa6faf5e4f28e6553851 SHA1 4688615dacf22e109906645875cfe9d4005cae66 SHA256 800d1572a9f7309d003bc1185477755dcdae92ace88099bb306c981af6037ad7
-EBUILD nethogs-0.6.0.ebuild 958 RMD160 e0edf753093668ff70b31d57c713c7bc78af6069 SHA1 3a9064ffc473933795dab459f16055f2d322894b SHA256 138b1795eeadd7459705e3b0eacf21214bff813d8cc3699ef7260e9a14b40579
+DIST nethogs-0.7.0.tar.gz 462155 RMD160 a0ed316b6bfc71608b2077f0040d782093199e7d SHA1 aa51f6064ffe1a3ddae351e87b5087ff92857269 SHA256 dbe45dd92ad25d19c5a38af04a26e2e2e9e0b1f692423c970239dfc421a66969
 EBUILD nethogs-0.6.1_pre2.ebuild 869 RMD160 2386a065e43c9b85254a955673cc0ded9adc4be9 SHA1 f9c1a6bba682883e21df83c2a9f4ebdf94b9c905 SHA256 661af666d0b9d16dda84189dfa9115e9bdf766b57c0b757f202a6ce3eae21329
-MISC ChangeLog 1838 RMD160 a7057afb8bdb4ea19fbd237e8c83bcba9b57bafa SHA1 1ae850c5d1f1ae006b9164e751de80708e669865 SHA256 4d1e0fb32d868c7eb8b40d543cd1ca1540bd975b33ae94afc1a7ae56e5ed6ea7
+EBUILD nethogs-0.7.0.ebuild 776 RMD160 ac6aa9089ecd6fc360c002f667af226481f4c47c SHA1 79947dcf1f4102cac3d16e3aad482c95a9bdcebc SHA256 ab95485fa0618d4349e8de5d25079bdfa5ad649e11f5e20e87d0a324dfea0198
+MISC ChangeLog 2071 RMD160 f9467fcea5f23f09459cdb0c69a88f71136826e3 SHA1 48e22bbbe250c71673b5ab7186f33bc2efd27f6d SHA256 a6a36ad0e85fd6d68a901ac47ef9db14a92969717265e9681532140eef29f3f6
 MISC metadata.xml 735 RMD160 f1fa8f6ae6a47dafa4601fd13a7018dbceac8000 SHA1 385773d26a316fefe9320db9f58d0922cb1e3314 SHA256 5ce2f1397461a65b352cbaaab1ce5ef48cff10fa923198e7ceead557183250a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklARksACgkQkKaRLQcq0GJlJgCdGqSyA/yHPvo8chQX46I14M7v
-WPQAnjpSry2ccT+XWAu6DgQIDBKl7RS9
-=Im0F
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nethogs/files/nethogs-0.6.0-gcc34.diff b/net-analyzer/nethogs/files/nethogs-0.6.0-gcc34.diff
deleted file mode 100644
index c85fb464010b..000000000000
--- a/net-analyzer/nethogs/files/nethogs-0.6.0-gcc34.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- decpcap.c~	2005-04-04 01:53:06.000000000 -0300
-+++ decpcap.c	2005-04-04 01:56:13.000000000 -0300
-@@ -76,6 +76,7 @@
- 			break;
- 		default:
- 			// TODO
-+			break;
- 	}
- }
- 
-@@ -98,6 +99,7 @@
- 			break;
- 		default:
- 			// TODO
-+			break;
- 	}
- }
- 
-@@ -128,6 +130,7 @@
- 			break;
- 		default:
- 			// TODO
-+			break;
- 	}
- }
- 
-@@ -173,6 +176,7 @@
- 			break;
- 		default:
- 			// TODO
-+			break;
- 	}
- }
- 
diff --git a/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch b/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch
new file mode 100644
index 000000000000..5a3285a1cf9a
--- /dev/null
+++ b/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch
@@ -0,0 +1,83 @@
+Replace CFLAGS for CXX target with CXXFLAGS. Add LDFLAGS to respect them.
+Use DESTDIR correctly, and fix typing error of sbin. - ssuominen@gentoo.org
+
+diff -ur nethogs.orig/Makefile nethogs/Makefile
+--- nethogs.orig/Makefile	2009-03-12 23:08:17.000000000 +0000
++++ nethogs/Makefile	2009-04-29 09:41:11.000000000 +0000
+@@ -2,17 +2,17 @@
+ SUBVERSION   := 7
+ MINORVERSION := 0
+ 
+-#DESTDIR := /usr
+-DESTDIR := /usr/local
+-
+-sbin  := $(DESTDIR)/sbin
+-man8 := $(DESTDIR)/share/man/man8/
++prefix := /usr
++# prefix := /usr/local
++sbin   := $(prefix)/sbin
++man8   := $(prefix)/share/man/man8
+ 
+ all: nethogs decpcap_test
+ # nethogs_testsum
+ 
+-CFLAGS=-g -Wall -Wextra
+-#CFLAGS=-O2
++CFLAGS   += -Wall
++CXXFLAGS += -Wall
++
+ OBJS=packet.o connection.o process.o refresh.o decpcap.o cui.o inode2prog.o conninode.o
+ .PHONY: tgz
+ 
+@@ -24,37 +24,37 @@
+ 	echo "Not implemented"
+ 
+ install: nethogs nethogs.8
+-	install -d -m 755 $(bin)
+-	install -m 755 nethogs $(bin)
+-	install -d -m 755 $(man8)
+-	install -m 644 nethogs.8 $(man8)
++	install -d -m 755 $(DESTDIR)$(sbin)
++	install -m 755 nethogs $(DESTDIR)$(sbin)
++	install -d -m 755 $(DESTDIR)$(man8)
++	install -m 644 nethogs.8 $(DESTDIR)$(man8)
+ 
+ nethogs: nethogs.cpp $(OBJS)
+-	$(CXX) $(CFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
+ nethogs_testsum: nethogs_testsum.cpp $(OBJS)
+-	$(CXX) $(CFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
++	$(CXX) $(CXXFLAGS) -g $(LDFLAGS) nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
+ 
+ decpcap_test: decpcap_test.cpp decpcap.o
+-	$(CXX) $(CFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm
+ 
+ #-lefence
+ 
+ refresh.o: refresh.cpp refresh.h nethogs.h
+-	$(CXX) $(CFLAGS) -c refresh.cpp
++	$(CXX) $(CXXFLAGS) -c refresh.cpp
+ process.o: process.cpp process.h nethogs.h
+-	$(CXX) $(CFLAGS) -c process.cpp
++	$(CXX) $(CXXFLAGS) -c process.cpp
+ packet.o: packet.cpp packet.h nethogs.h
+-	$(CXX) $(CFLAGS) -c packet.cpp
++	$(CXX) $(CXXFLAGS) -c packet.cpp
+ connection.o: connection.cpp connection.h nethogs.h
+-	$(CXX) $(CFLAGS) -c connection.cpp
++	$(CXX) $(CXXFLAGS) -c connection.cpp
+ decpcap.o: decpcap.c decpcap.h
+ 	$(CC) $(CFLAGS) -c decpcap.c
+ inode2prog.o: inode2prog.cpp inode2prog.h nethogs.h
+-	$(CXX) $(CFLAGS) -c inode2prog.cpp
++	$(CXX) $(CXXFLAGS) -c inode2prog.cpp
+ conninode.o: conninode.cpp nethogs.h conninode.h
+-	$(CXX) $(CFLAGS) -c conninode.cpp
++	$(CXX) $(CXXFLAGS) -c conninode.cpp
+ cui.o: cui.cpp cui.h nethogs.h
+-	$(CXX) $(CFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
++	$(CXX) $(CXXFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
+ 
+ .PHONY: clean
+ clean:
diff --git a/net-analyzer/nethogs/nethogs-0.6.0.ebuild b/net-analyzer/nethogs/nethogs-0.6.0.ebuild
deleted file mode 100644
index 0e04dc0c2a47..000000000000
--- a/net-analyzer/nethogs/nethogs-0.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.6.0.ebuild,v 1.8 2007/04/12 17:59:22 welp Exp $
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://nethogs.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc34.diff
-	# fix hardcoded CFLAGS and CC
-	sed -i -e "s:-O2:${CFLAGS}:g" Makefile
-	sed -i -e "s:g++:$(tc-getCXX):g" Makefile
-	sed -i -e "s:gcc:$(tc-getCC):g" Makefile
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	# Not using make install or einstall because of the hardcoded paths in Makefile
-	dosbin nethogs
-	doman nethogs.8
-	dodoc Changelog DESIGN README
-}
diff --git a/net-analyzer/nethogs/nethogs-0.7.0.ebuild b/net-analyzer/nethogs/nethogs-0.7.0.ebuild
new file mode 100644
index 000000000000..d350fa998b38
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.7.0.ebuild,v 1.1 2009/04/29 06:50:47 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="http://nethogs.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap
+	sys-libs/ncurses"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc Changelog DESIGN README
+}