Use CXXFLAGS not CFLAGS (bug #517706).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 43 insertions, 7 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/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