summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-07-21 19:01:52 +0000
committerJeroen Roovers <jer@gentoo.org>2014-07-21 19:01:52 +0000
commit94ff6f288d0c3921d4d1541b4421d44d4403f27c (patch)
tree9a265293806a452ff69150b9991c97e81cbb6c8c /net-analyzer
parentPodParser becomes Pod-Parser (diff)
downloadhistorical-94ff6f288d0c3921d4d1541b4421d44d4403f27c.tar.gz
historical-94ff6f288d0c3921d4d1541b4421d44d4403f27c.tar.bz2
historical-94ff6f288d0c3921d4d1541b4421d44d4403f27c.zip
Use CXXFLAGS not CFLAGS (bug #517706).
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nethogs/ChangeLog8
-rw-r--r--net-analyzer/nethogs/Manifest14
-rw-r--r--net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch40
-rw-r--r--net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild (renamed from net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild)2
4 files changed, 50 insertions, 14 deletions
diff --git a/net-analyzer/nethogs/ChangeLog b/net-analyzer/nethogs/ChangeLog
index 261021b106f6..5e83313c6a3b 100644
--- a/net-analyzer/nethogs/ChangeLog
+++ b/net-analyzer/nethogs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/nethogs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.24 2014/05/03 14:10:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.25 2014/07/21 19:01:50 jer Exp $
+
+*nethogs-0.8.0-r4 (21 Jul 2014)
+
+ 21 Jul 2014; Jeroen Roovers <jer@gentoo.org> -nethogs-0.8.0-r3.ebuild,
+ +nethogs-0.8.0-r4.ebuild, files/nethogs-0.8.0-gentoo.patch:
+ Use CXXFLAGS not CFLAGS (bug #517706).
03 May 2014; Markus Meier <maekke@gentoo.org> nethogs-0.8.0-r3.ebuild:
add ~arm, bug #505974
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 07260f93fa74..626cafd3f2e9 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX nethogs-0.8.0-gentoo.patch 1564 SHA256 a30815fc7a18d971e9d3bbab48d7acf804c7db5f92ace0553958e0fc7735eebb SHA512 d774e398ea468c26af02bfce1a37f0df62ad2949b28acd22eecd77f8575019be601560da6514b72a1c2008fdff41edc313d1a5a268ebead6582cbfbef782b9b5 WHIRLPOOL c2ae3c0b50dcb0dbbdbf81ad07f486ed55779dc1fa9d302d354a1c2f61e091eeac37ee6233201bfdef676b42c094d8efaf3cfe48934e397f17fd65b22a6d16c1
+AUX nethogs-0.8.0-gentoo.patch 2795 SHA256 1a709a55deecd80062153a231480c17c4189915d5f2135703921bc41b9e84345 SHA512 47149df5e562adc7f9bf95edd445268d5ab8c75c7ad8794db1746aa77b0b15002679b7ac5d5e109ee867cd76f2cba07441b10202aa361dab5524aace3264019c WHIRLPOOL 72b7aaa0615ad8c8706d230b785badd62ef77e1cc8c91d9d488198affbc4b2065ceb8b39af3443b5d2147ca17aa571c9d9b27b7809891f99b07b749aa950c093
DIST nethogs-0.8.0.tar.gz 38036 SHA256 b09cb3c2690a522f8b1314221095d5abb1958d50b56de6d36b11a8e6f28961d0 SHA512 6530c1bdbdf1ace7368941e8e0e53a83ac808bbea7a952936fa570ad2d49e8b4cef6a37d433f1873655edfd63cce556146a48ff81665905827237edf50419446 WHIRLPOOL 1b7c7456e2c55df0be188a0858ee039f7fde52ae58554ca16f7b92f732735ad4e225341526f6c4d36051898160cb063dac6fc4479ff1e3decabc9d62346dd3d5
EBUILD nethogs-0.8.0-r2.ebuild 833 SHA256 ec9a265d1ebda01f249088a50c757e5ac3b3ec82c9255da7742f19d5122d80ca SHA512 31866319fb08f8ad37931c369971ba937236b08b6c32c020884f5b9eb18ef02e0a809159d481077e3cb9df6241206451701c6646d41fb4183775bb5d708ad86f WHIRLPOOL b793ea4c8f2eedb38e03fb336f45f5b4f7bb1091b42600dd41dcd6786b9b84ad477840175f1b055c0330e830528cd70f04cb7b02f3238235e4c665e8153e7919
-EBUILD nethogs-0.8.0-r3.ebuild 711 SHA256 75444c7efbec484684e033d190588689a930244463b2004493cc14fb3b10277a SHA512 27e4b99680ab421e18bc8e76ce90974141306ce99287ad7acd6df5faa297293ba38654a3fdead917e0d8a677c2a4d5642b8cef4dd92987d1c3c52ffd5e2315d8 WHIRLPOOL 145c8fb743e8849d3afbac6403e4b5c52813288749cfd3d57a3c71c71defab7db06efe6c78f52c8b2b3cda3e6c8877f4d7232472c113dd1e38e7a99360a77f37
-MISC ChangeLog 3703 SHA256 285c3d89f2c832c32883ac30f8a0923e3c5589c917199e11a506f74891effbee SHA512 11f8365a4f17b80cd260b45e8275b7bc58869b54e33586120e7a5ae956975da920ea84a5bb02ae5763fb4dae8766d7524c5e5921fdc7af6c25d234cc15c4e37d WHIRLPOOL c6c4c020c00fd1e2fdc45bb2dff398f04f58968f57ef30ab00b61cb2437c5d6d4afc109da871d24e1d79c63caea6bf274de59e9fb5af8e0393b93a92ea303419
+EBUILD nethogs-0.8.0-r4.ebuild 708 SHA256 e358a5ceb58a92eb21cfa502abb7ea492ab74f8407dcb5a7bb503e41b8005646 SHA512 7f36655a9140604bd784ab5f98477dd7b7bfa58fdac93a6f6cccf678ed29886d82db036a51f9b10ff491b919d252ded88cc17761318fce41ea6cf7790f58346d WHIRLPOOL 49deda25a8c1013177b5fd28d59cef3bf2d887b55025da21823c1f5030720957ad162056aac17299ad88f85be1c30f43b39863d09b6ee0d031dddf796dc5c942
+MISC ChangeLog 3910 SHA256 fb9f09c9a39679249f1447ceeaf44c86a0c191076201ec976658f67afcc1d9ec SHA512 f25cd576fd2c8a388b09c3641b940cc1f41a014a5b2e195b6e114ca4e4f853650e2d8ab5580bf92433cb75bb2c7ed091c8466640487e9ef90ec61893874c7756 WHIRLPOOL 190f3b46034f99ac44ae285f8dc9052735efacede123c7926880d70e7e1d49135795b6a2d5f355ab58507a59b2996be8ddfb187f697927b6d09f612606b51599
MISC metadata.xml 637 SHA256 6816148b2e3fec681a27ac03458b8ed54cfebbf81bcb4b0d29628d7ba7d2b8ff SHA512 340cea57eccb62837e9457da3c4ec5652ea1e965dadb39ada2c6fed23f7c28fb3e4eecfa5722cd1fb044fb483eea40f259a3c4bddf562ca37e1a15bac879d93a WHIRLPOOL f9aab1c9785c485f7676fa58a2f00b8b59d738d4c3089ff1226479bef5cdc73b7ba733eff861d75364a24ff544a49cb493eddee390f45cdeb84385c11d7db1e3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iEYEAREIAAYFAlNk+qsACgkQkKaRLQcq0GIvhQCeLY5V2G66nH/7K7Re2sowb1be
-8ysAnj1ZJxkXBxv1f9dkDu78vc/Cl55L
-=/T6g
+iEYEAREIAAYFAlPNY6AACgkQVWmRsqeSphPBOgCfexyXdcYCe3dMQBOpuHjT+Re3
+KlEAnRD1csDC3hw5OHla8OntUjkdGNR0
+=+OCE
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch b/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch
index f1f1ceda7487..292af8e4175b 100644
--- a/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch
+++ b/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch
@@ -14,7 +14,7 @@
-CFLAGS=-g -Wall -Wextra
-#CFLAGS=-O2
-+CFLAGS+= -Wall -Wextra
++CXXFLAGS+= -Wall -Wextra
OBJS=packet.o connection.o process.o refresh.o decpcap.o cui.o inode2prog.o conninode.o devices.o
+
+LIBS = $(shell $(PKG_CONFIG) --libs ncurses)
@@ -22,19 +22,49 @@
.PHONY: tgz
tgz: clean
-@@ -30,12 +32,12 @@
+@@ -30,33 +32,33 @@
install -m 644 nethogs.8 $(man8)
nethogs: nethogs.cpp $(OBJS)
- $(CXX) $(CFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
-+ $(CXX) $(CFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm $(LIBS) -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) $(CFLAGS) $(LDFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm $(LIBS) -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) $(CFLAGS) $(LDFLAGS) 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
++ $(CC) $(CXXFLAGS) -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
+ #devices.o: devices.cpp devices.h
+-# $(CXX) $(CFLAGS) -c devices.cpp
++# $(CXX) $(CXXFLAGS) -c devices.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.8.0-r3.ebuild b/net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild
index 05b0527b370e..efb79f54f460 100644
--- a/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild,v 1.2 2014/05/03 14:10:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.8.0-r4.ebuild,v 1.1 2014/07/21 19:01:50 jer Exp $
EAPI=5