Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nethogs/, net-analyzer/nethogs/files/
Date: Sat, 24 Dec 2016 12:06:16
Message-Id: 1482581171.992371804021fdebbae0c004eae1346b1179c62a.jer@gentoo
1 commit: 992371804021fdebbae0c004eae1346b1179c62a
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 24 12:05:30 2016 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 24 12:06:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99237180
7
8 net-analyzer/nethogs: Old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 net-analyzer/nethogs/Manifest | 1 -
13 .../nethogs/files/nethogs-0.8.0-gentoo.patch | 70 ----------------------
14 net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild | 33 ----------
15 3 files changed, 104 deletions(-)
16
17 diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
18 index 974556c..a694127 100644
19 --- a/net-analyzer/nethogs/Manifest
20 +++ b/net-analyzer/nethogs/Manifest
21 @@ -1,2 +1 @@
22 -DIST nethogs-0.8.0.tar.gz 38036 SHA256 b09cb3c2690a522f8b1314221095d5abb1958d50b56de6d36b11a8e6f28961d0 SHA512 6530c1bdbdf1ace7368941e8e0e53a83ac808bbea7a952936fa570ad2d49e8b4cef6a37d433f1873655edfd63cce556146a48ff81665905827237edf50419446 WHIRLPOOL 1b7c7456e2c55df0be188a0858ee039f7fde52ae58554ca16f7b92f732735ad4e225341526f6c4d36051898160cb063dac6fc4479ff1e3decabc9d62346dd3d5
23 DIST nethogs-0.8.1.tar.gz 35986 SHA256 4c30ef43814549974a5b01fb1a94eb72ff08628c5a421085b1ce3bfe0524df42 SHA512 f1af7bb7208d08fc3a51bb38ee475da5a7b8f8814e2a7a653057d0c5d6b4e73be7742ffef5569525822160971f81dd22212d6854483928e621cfddce8d98409f WHIRLPOOL 4595abdb530329f41dc4d3c4e6ab8cf87a8589d9cd6f8f217644f435449c86747c66ed9884a2afcc858b7eaa9d216ef8d686bc7c5eff84bbec98151bea9ab6c3
24
25 diff --git a/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch b/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch
26 deleted file mode 100644
27 index 292af8e..00000000
28 --- a/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch
29 +++ /dev/null
30 @@ -1,70 +0,0 @@
31 ---- a/Makefile
32 -+++ b/Makefile
33 -@@ -5,15 +5,17 @@
34 - #DESTDIR := /usr
35 - DESTDIR := /usr/local
36 -
37 --sbin := $(DESTDIR)/sbin
38 --man8 := $(DESTDIR)/share/man/man8/
39 -+sbin := $(DESTDIR)/usr/sbin
40 -+man8 := $(DESTDIR)/usr/share/man/man8/
41 -
42 - all: nethogs decpcap_test
43 - # nethogs_testsum
44 -
45 --CFLAGS=-g -Wall -Wextra
46 --#CFLAGS=-O2
47 -+CXXFLAGS+= -Wall -Wextra
48 - OBJS=packet.o connection.o process.o refresh.o decpcap.o cui.o inode2prog.o conninode.o devices.o
49 -+
50 -+LIBS = $(shell $(PKG_CONFIG) --libs ncurses)
51 -+
52 - .PHONY: tgz
53 -
54 - tgz: clean
55 -@@ -30,33 +32,33 @@
56 - install -m 644 nethogs.8 $(man8)
57 -
58 - nethogs: nethogs.cpp $(OBJS)
59 -- $(CXX) $(CFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
60 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
61 - nethogs_testsum: nethogs_testsum.cpp $(OBJS)
62 -- $(CXX) $(CFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
63 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
64 -
65 - decpcap_test: decpcap_test.cpp decpcap.o
66 -- $(CXX) $(CFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm
67 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm
68 -
69 - #-lefence
70 -
71 - refresh.o: refresh.cpp refresh.h nethogs.h
72 -- $(CXX) $(CFLAGS) -c refresh.cpp
73 -+ $(CXX) $(CXXFLAGS) -c refresh.cpp
74 - process.o: process.cpp process.h nethogs.h
75 -- $(CXX) $(CFLAGS) -c process.cpp
76 -+ $(CXX) $(CXXFLAGS) -c process.cpp
77 - packet.o: packet.cpp packet.h nethogs.h
78 -- $(CXX) $(CFLAGS) -c packet.cpp
79 -+ $(CXX) $(CXXFLAGS) -c packet.cpp
80 - connection.o: connection.cpp connection.h nethogs.h
81 -- $(CXX) $(CFLAGS) -c connection.cpp
82 -+ $(CXX) $(CXXFLAGS) -c connection.cpp
83 - decpcap.o: decpcap.c decpcap.h
84 -- $(CC) $(CFLAGS) -c decpcap.c
85 -+ $(CC) $(CXXFLAGS) -c decpcap.c
86 - inode2prog.o: inode2prog.cpp inode2prog.h nethogs.h
87 -- $(CXX) $(CFLAGS) -c inode2prog.cpp
88 -+ $(CXX) $(CXXFLAGS) -c inode2prog.cpp
89 - conninode.o: conninode.cpp nethogs.h conninode.h
90 -- $(CXX) $(CFLAGS) -c conninode.cpp
91 -+ $(CXX) $(CXXFLAGS) -c conninode.cpp
92 - #devices.o: devices.cpp devices.h
93 --# $(CXX) $(CFLAGS) -c devices.cpp
94 -+# $(CXX) $(CXXFLAGS) -c devices.cpp
95 - cui.o: cui.cpp cui.h nethogs.h
96 -- $(CXX) $(CFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
97 -+ $(CXX) $(CXXFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
98 -
99 - .PHONY: clean
100 - clean:
101
102 diff --git a/net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild b/net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild
103 deleted file mode 100644
104 index 3f0bc40..00000000
105 --- a/net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild
106 +++ /dev/null
107 @@ -1,33 +0,0 @@
108 -# Copyright 1999-2015 Gentoo Foundation
109 -# Distributed under the terms of the GNU General Public License v2
110 -# $Id$
111 -
112 -EAPI=5
113 -
114 -inherit eutils toolchain-funcs
115 -
116 -DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
117 -HOMEPAGE="http://nethogs.sf.net/"
118 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
119 -
120 -LICENSE="GPL-1"
121 -SLOT="0"
122 -KEYWORDS="amd64 ~arm ~ia64 x86"
123 -
124 -RDEPEND="
125 - net-libs/libpcap
126 - sys-libs/ncurses:0=
127 -"
128 -DEPEND="
129 - ${RDEPEND}
130 - virtual/pkgconfig
131 -"
132 -
133 -DOCS=( Changelog DESIGN README )
134 -
135 -S=${WORKDIR}/${PN}
136 -
137 -src_prepare() {
138 - epatch "${FILESDIR}"/${P}-gentoo.patch
139 - tc-export CC CXX PKG_CONFIG
140 -}