Old.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

6 files changed, 6 insertions, 202 deletions

diff --git a/net-analyzer/nethogs/ChangeLog b/net-analyzer/nethogs/ChangeLog
index 71561c4948ae..673e8a7e26b3 100644
--- a/net-analyzer/nethogs/ChangeLog
+++ b/net-analyzer/nethogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nethogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.21 2012/01/28 15:07:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.22 2012/01/28 18:09:31 jer Exp $
+
+  28 Jan 2012; Jeroen Roovers <jer@gentoo.org> -nethogs-0.6.1_pre2.ebuild,
+  -files/nethogs-0.6.1_pre2-gcc43.patch, -nethogs-0.7.0.ebuild,
+  -files/nethogs-0.7.0-Makefile.patch, -files/nethogs-0.7.0-gcc44.patch:
+  Old.
 
   28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> nethogs-0.8.0-r2.ebuild:
   x86 stable wrt bug #400611
diff --git a/net-analyzer/nethogs/files/nethogs-0.6.1_pre2-gcc43.patch b/net-analyzer/nethogs/files/nethogs-0.6.1_pre2-gcc43.patch
deleted file mode 100644
index 2f4423532ccf..000000000000
--- a/net-analyzer/nethogs/files/nethogs-0.6.1_pre2-gcc43.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur nethogs.orig/cui.cpp nethogs/cui.cpp
---- nethogs.orig/cui.cpp	2004-09-17 22:23:20.000000000 +0300
-+++ nethogs/cui.cpp	2008-12-05 12:02:58.000000000 +0200
-@@ -2,6 +2,7 @@
- #include <string>
- #include <pwd.h>
- #include <sys/types.h>
-+#include <stdlib.h>
- 
- #include <ncurses.h>
- #include "nethogs.h"
-diff -ur nethogs.orig/decpcap.c nethogs/decpcap.c
---- nethogs.orig/decpcap.c	2004-09-18 15:23:38.000000000 +0300
-+++ nethogs/decpcap.c	2008-12-05 12:04:46.000000000 +0200
-@@ -5,6 +5,7 @@
- #include <netinet/tcp.h>
- #include <pcap.h>
- #include "decpcap.h"
-+#include <string.h>
- 
- /* data container for callback-references */
- 
-diff -ur nethogs.orig/inodeproc.cpp nethogs/inodeproc.cpp
---- nethogs.orig/inodeproc.cpp	2004-09-14 19:14:23.000000000 +0300
-+++ nethogs/inodeproc.cpp	2008-12-05 12:06:30.000000000 +0200
-@@ -11,6 +11,8 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#include <limits.h>
-+
- struct proginfo
- {
- 	int pid;
diff --git a/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch b/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch
deleted file mode 100644
index 5a3285a1cf9a..000000000000
--- a/net-analyzer/nethogs/files/nethogs-0.7.0-Makefile.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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/files/nethogs-0.7.0-gcc44.patch b/net-analyzer/nethogs/files/nethogs-0.7.0-gcc44.patch
deleted file mode 100644
index ab1aaf6314f7..000000000000
--- a/net-analyzer/nethogs/files/nethogs-0.7.0-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ur nethogs.orig/conninode.cpp nethogs/conninode.cpp
---- nethogs.orig/conninode.cpp	2008-12-06 11:28:29.000000000 +0000
-+++ nethogs/conninode.cpp	2009-05-07 16:53:03.000000000 +0000
-@@ -1,5 +1,6 @@
- #include <netinet/in.h>
- #include <map>
-+#include <stdio.h>
- #include <stdlib.h>
- 
- #include "nethogs.h"
diff --git a/net-analyzer/nethogs/nethogs-0.6.1_pre2.ebuild b/net-analyzer/nethogs/nethogs-0.6.1_pre2.ebuild
deleted file mode 100644
index 6cdc74285f11..000000000000
--- a/net-analyzer/nethogs/nethogs-0.6.1_pre2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.6.1_pre2.ebuild,v 1.4 2009/04/29 06:52:33 ssuominen Exp $
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://nethogs.sf.net/"
-SRC_URI="http://${PN}.sourceforge.net/${P/_/-}.tar.gz"
-DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="net-libs/libpcap
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	sed -e "s:-O2:${CFLAGS}:g" -e "s:g++:$(tc-getCXX):g" \
-		-e "s:gcc:$(tc-getCC):g" -i Makefile || die "sed failed."
-}
-
-src_compile() {
-	emake || die "emake failed."
-}
-
-src_install() {
-	dosbin ${PN} || die "dosbin failed."
-	doman ${PN}.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
deleted file mode 100644
index ff71d5298291..000000000000
--- a/net-analyzer/nethogs/nethogs-0.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.4 2009/11/03 17:27:16 armin76 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 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND="net-libs/libpcap
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-gcc44.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
-}