closing Bug 426766, making plugins respect cxxflags

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 122 insertions, 2 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 5437cfb6ee40..13f453a7d6dd 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.126 2012/07/06 21:14:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.127 2012/07/23 17:13:22 zerochaos Exp $
+
+  23 Jul 2012; Rick Farina <zerochaos@gentoo.org>
+  +files/kismet-2011.03.2-cflags-backport.patch, kismet-2011.03.2-r3.ebuild:
+  closing Bug 426766, making plugins respect cxxflags
 
   06 Jul 2012; Rick Farina <zerochaos@gentoo.org> kismet-9999.ebuild:
   fixing missing SRC_URI in live conditional
diff --git a/net-wireless/kismet/files/kismet-2011.03.2-cflags-backport.patch b/net-wireless/kismet/files/kismet-2011.03.2-cflags-backport.patch
new file mode 100644
index 000000000000..2ef2a6b59df6
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2011.03.2-cflags-backport.patch
@@ -0,0 +1,115 @@
+diff -Naur kismet-2011-03-R2/plugin-autowep/Makefile kismet-2011-03-R2-cflags/plugin-autowep/Makefile
+--- kismet-2011-03-R2/plugin-autowep/Makefile	2012-07-23 12:58:09.961131948 -0400
++++ kismet-2011-03-R2-cflags/plugin-autowep/Makefile	2012-07-23 13:00:04.544135017 -0400
+@@ -12,6 +12,7 @@
+ PLUGINLDFLAGS += -shared -rdynamic
+ LIBS	+= -lstdc++ 
+ CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
++CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+ 
+ PLUGOBJS = autowep-kismet.o
+ PLUGOUT = autowep-kismet.so
+@@ -34,9 +35,9 @@
+ 	@-rm -f *.so
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $*.c -o $@ 
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
+ 
+ .cc.o:
+-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
+ 
+ .SUFFIXES: .c .cc .o
+diff -Naur kismet-2011-03-R2/plugin-btscan/Makefile kismet-2011-03-R2-cflags/plugin-btscan/Makefile
+--- kismet-2011-03-R2/plugin-btscan/Makefile	2012-07-23 12:58:09.962131948 -0400
++++ kismet-2011-03-R2-cflags/plugin-btscan/Makefile	2012-07-23 13:02:33.016138993 -0400
+@@ -12,6 +12,7 @@
+ PLUGINLDFLAGS += -shared -rdynamic
+ LIBS	+= -lstdc++ -lbluetooth -lpthread -lncurses -lpanel
+ CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
++CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+ 
+ SRVOBJS = packetsource_linuxbt.o tracker_btscan.o dumpfile_btscantxt.o kismet_btscan.o
+ SRVOUT	= btscan.so
+@@ -44,9 +45,9 @@
+ 	@-rm -f *.so
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $*.c -o $@ 
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
+ 
+ .cc.o:
+-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
+ 
+ .SUFFIXES: .c .cc .o
+diff -Naur kismet-2011-03-R2/plugin-dot15d4/Makefile kismet-2011-03-R2-cflags/plugin-dot15d4/Makefile
+--- kismet-2011-03-R2/plugin-dot15d4/Makefile	2012-07-23 12:58:09.962131948 -0400
++++ kismet-2011-03-R2-cflags/plugin-dot15d4/Makefile	2012-07-23 13:03:17.209140176 -0400
+@@ -12,6 +12,7 @@
+ PLUGINLDFLAGS += -shared -rdynamic
+ LIBS	+= -lstdc++ -lusb -lpthread
+ CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
++CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+ 
+ SRVOBJS = packetsource_raven.o packetsource_serialdev.o \
+ 			packet_dot15d4.o packet_dot15d4_types.o \
+@@ -39,9 +40,9 @@
+ 	@-rm -f *.so
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $*.c -o $@ 
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
+ 
+ .cc.o:
+-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
+ 
+ .SUFFIXES: .c .cc .o
+diff -Naur kismet-2011-03-R2/plugin-ptw/Makefile kismet-2011-03-R2-cflags/plugin-ptw/Makefile
+--- kismet-2011-03-R2/plugin-ptw/Makefile	2012-07-23 12:58:09.963131948 -0400
++++ kismet-2011-03-R2-cflags/plugin-ptw/Makefile	2012-07-23 13:04:25.764142014 -0400
+@@ -12,6 +12,7 @@
+ PLUGINLDFLAGS += -shared -rdynamic
+ LIBS	+= -lstdc++ -lssl -lpthread -lcrypto
+ CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
++CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+ 
+ PLUGOBJS = aircrack-crypto.o aircrack-ptw2-lib.o aircrack-kismet.o
+ PLUGOUT = aircrack-kismet.so
+@@ -34,9 +35,9 @@
+ 	@-rm -f *.so
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $*.c -o $@ 
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
+ 
+ .cc.o:
+-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
+ 
+ .SUFFIXES: .c .cc .o
+diff -Naur kismet-2011-03-R2/plugin-spectools/Makefile kismet-2011-03-R2-cflags/plugin-spectools/Makefile
+--- kismet-2011-03-R2/plugin-spectools/Makefile	2012-07-23 12:58:09.963131948 -0400
++++ kismet-2011-03-R2-cflags/plugin-spectools/Makefile	2012-07-23 13:05:12.121143257 -0400
+@@ -12,6 +12,7 @@
+ PLUGINLDFLAGS += -shared -rdynamic
+ LIBS	+= -lstdc++ 
+ CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
++CXXFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
+ 
+ CLIOBJS = spectools_ui.o
+ CLIOUT	= spectools_ui.so
+@@ -44,9 +45,9 @@
+ 	@-rm -f *.so
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $*.c -o $@ 
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@ 
+ 
+ .cc.o:
+-	$(CXX) $(CFLAGS) -c $*.cc -o $@ 
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $*.cc -o $@ 
+ 
+ .SUFFIXES: .c .cc .o
diff --git a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
index ec8df438a06c..ab2d77430126 100644
--- a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
+++ b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.5 2012/07/03 16:37:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.6 2012/07/23 17:13:22 zerochaos Exp $
 
 EAPI=4
 
@@ -61,6 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/kismet-console-scrolling-backport.patch
 	epatch "${FILESDIR}"/header_alignment_r3326.patch
 	epatch "${FILESDIR}"/use-hostname-by-default.patch
+	epatch "${FILESDIR}"/${P}-cflags-backport.patch
 }
 
 src_configure() {