closing Bug 426766, making plugins respect cxxflags

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 127 insertions, 26 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/Manifest b/net-wireless/kismet/Manifest
index e793a93da54d..b670782309a1 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX bluechanfix_r3184.patch 452 SHA256 f7c9449039c76f5a919ad8399ce49b518c01046db1566bce25fd34496482faf0 SHA512 6e9ef7a64a8b5e9fa494627b9bb818582d7b7415164a67e321460bce3d2ad88c57fc7b2a79c0384fd7346181debf5e32ca984630fc0477bf271825a16d2c5858 WHIRLPOOL 053d43042201556fec485e549dca184eb28dac77a2f4cfc69d566c5dda7da45f205e692c76cb208c97c535e4ac09edd0b6e5071c92e6d37ce9b93908af07ae7d
 AUX gcc-4.3.patch 1221 SHA256 5e98a582f93169f5525338b9842c9196ff8d2764c69f4dc412acafb67e3b002b SHA512 2b5415772af18e9ee29a9f02141560ce1fb54587139ded0fdbf13c58414eb9c177ed0eedddb53bdf8353724fd2fd6baa66448c82a8a4d872539afa8e24b25360 WHIRLPOOL aea1db40cb6a269bf84d5f18b1fc2766d83842cefc7de0211e604934cde511734d57bf85cc00360c3abfc79bf3ffaddd71be71947b5b1f3cd955b78882e56a65
 AUX header_alignment_r3326.patch 2031 SHA256 0a4afdc0cb74cb0ea7012f912fb886acb3d6bd42345835a26bf44f0a1ab63556 SHA512 4807e558a72ab429ffbbd3e245338b58ef9f29940b518ca76d86345ab3302679a77212699cfb1714b593eb6dc02703155c12ae9aa9dd15d402b90e6607c8f472 WHIRLPOOL e4f87d4760d9300c9c7a56a08edc9764a16642def7df000394a83b20ab00890bb1e8106985c3aa3918fa2e6bb9372f7c4d96e0fecf71337cc7b0b6e534de5129
@@ -8,34 +5,18 @@ AUX kismet-2007.10.1-Makefile.in.patch 2716 SHA256 d74c9b7c558beff78908e3d720d2b
 AUX kismet-2007.10.1-conf.d 403 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71 WHIRLPOOL 51e1ccf14cca8533525f038a6b6755233e3f4e65486952b09f80372756ac128d4359f3061fb97348673a5a7dfc595e3b63bfef2db5be4814f2b2cf76b2ee1de9
 AUX kismet-2007.10.1-init.d 749 SHA256 1dd3fd3fee724490908abe072577ab159c2371820561872f8af0e30ea2f83054 SHA512 7d9035e01379e04f4200b041171381f731c6d68c2d0776505322ef7dbeccba60523d9ef3cfa99021a57f86f2b076fe27d1ef5c702f2400a59df1180c34fd7699 WHIRLPOOL 820a95d33ca9a2ea98bf049e179b7c11762311cfbb99a8c8e0b90606baffb88eb6cd8032d6000a1bd5a574491f457a5cc0cfecb63f48cab50fcbf78d51c83b70
 AUX kismet-2008.05.1-glibc-2.10.patch 408 SHA256 a9a21167e0d000664c420f6eed2520119334b8d81cfc1730f70ac0396db4d716 SHA512 5ebf99eea02318f16d6b5ae2499b80c18bcb83221eddca93cacb3a0ad6df0dd7769e6af85486e33774d7b5f3be5d6a566784dfe70b2e6912a4067f3cad032877 WHIRLPOOL 6630f37bf325d18ea79bb431ed64b96addacc0692b8dea5cb9861934e9654e57dee5174fd5698d2bcc5dc46ded2628b41fb5e8fa2ab0ea8c4e8f491e05b2e9dd
+AUX kismet-2011.03.2-cflags-backport.patch 3952 SHA256 8300459a7f15b00d78c20c7bcdb757bf4adf00f28790b39dfd72cb70a0242906 SHA512 0eefcf8f515c379d77206d2b423f3f72af1b22ea57f3b94491d55e1e569f3c7cca67aae77e24afa45d998292b0d23c9d6431ccb8b4842cc50225717290dfe86c WHIRLPOOL 864b142573773d10bdbb0abbfac2073389cfb6506c80cc1836dd837cd0af91d870380d4ec76b17d184237e65fa91d7661daafed4208596984d4839b9b49e8d76
 AUX kismet-console-scrolling-backport.patch 555 SHA256 8b3ce7113e5214ffba9dd75b6027adb9f92f6e56dc3dbfde2045c77b5c44223f SHA512 6a202bf80b20553ab00a5ff7560d2cec6fbd9c23c3a47cc0a934ea2c8bd08bff7c172644474e80cd195bf4115ed9b3b4e5680de3fe29b8697be62aa33929f07a WHIRLPOOL b03d53e761933782857821633a5f09d72899bc985e795dfa6216a06a99b44fb2fc3918633062cb4c4a4563b1d0c424c62aafef7040be6794846b617365bde18e
 AUX kismet.confd 403 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71 WHIRLPOOL 51e1ccf14cca8533525f038a6b6755233e3f4e65486952b09f80372756ac128d4359f3061fb97348673a5a7dfc595e3b63bfef2db5be4814f2b2cf76b2ee1de9
 AUX kismet.initd 742 SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444f3aa6687a624 SHA512 3346b113f4370097c1638970b70a918f70b49d6db77bef627dbb5ccea8eed1e02d47f57414beaef163475ecf785d27b77a6501f4917ea9fe62a043c3f39fc3ae WHIRLPOOL 1e4de7b8012fa5f3b7d0e1ad704f4383cf5c3110d22ff9e54b292d7792b52a289e9e58fec26d6893f1a084e1501c9eaff728b435468a9f5c67b7cac6848b9e39
 AUX makefile.patch 5112 SHA256 17f7074d0a6d3bf0f54278dd6d7a82a3fe1f2a935cd3dcef693b0177dc0ddd1a SHA512 d571a22ffbb8ee1d015f96641b3770837fe4a1a0da630344c08ce9d338d1b2c4136ad7ccc74496a011742f44984019303e0faa0bb5998cfd880cc92f8ad896a6 WHIRLPOOL 6668d9bffcb17079085c7784828eeb16bcee9f79b6b3f541f38d26416f569d18d66672c4b49fa88f2faf0899efd119a8107b26656e978b2cd2d0ea3b7b04f901
 AUX plugins-ldflags.patch 385 SHA256 0cff39e40278880d4810569dc1a17c156a3e3a11579b0ce94ce394795aba1765 SHA512 43dfa75746d7b2bfa4f2de959d08d5eb040053ec98597bec71fd3f4993352936aff9b9f7c6b3a4ac7c69fdfc8308395c83d9427dcb07d22cee907cbb66e05a91 WHIRLPOOL 64a76e73470dfbf78db78ee2d242f4dfd92c4d2562dd597e3281d27abfc7f2a6e21b15d5b2893ba290e6f63c4f59887179717f5feec476e54a1d9165133dd55d
 AUX use-hostname-by-default.patch 1156 SHA256 34b7f8280549ab6022486b5e5744a6d7cebd54d727ebde4fbe5af8955d17d530 SHA512 919ea108ae089a033532ef3bf0d741c2b9e32547326b68bb8b3c1821d60493039882b3e660ea2d326205a68136d550a74e5fdff728a11ac86ea666f43af2ecb8 WHIRLPOOL be922f04a05074bfc78b40598e9ed8e42876859d92666f52b53e3f6725902621ab04050ca3b0a2bbebe5081f21e5d7e4851ff59832e1e84abd99a2c17db2d947
-DIST kismet-2008-05-R1.tar.gz 655362 RMD160 5613207b45f85fa72d146009434df984f721ccdc SHA1 8355aeb0374a39549dfdc0c73160125eadd7c6e2 SHA256 a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
-DIST kismet-2011-03-R2.tar.gz 924988 RMD160 58fcc5e8e438fa9d94959ea0c5b2c914ebf44081 SHA1 c01706b0441a3ea412386930bcbaf56187c66d27 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64
+DIST kismet-2008-05-R1.tar.gz 655362 SHA256 a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
+DIST kismet-2011-03-R2.tar.gz 924988 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64 SHA512 4a74edd5b74ecf2171ab20a2cec5c2d0abcb6a9f24fbac6bbcab8039c67927ffa393e27932be49625a9f15c8580ea88ae51b65e42a4de5bf6bdf65631c26bb18 WHIRLPOOL 7975cfe9c754e902fc4861540ac4c21892df39f4edfc71870ee944a09769305614360a640c27753b1770bd2b1ee82f06725afbf30afb51880536d3c38261b920
 EBUILD kismet-2008.05.1.ebuild 1574 SHA256 61a51e9f1631fb853b0ee6ef4c63367b11b55c27d09ac8d252bd4607add9d3f0 SHA512 a659006832afb96fd865d67b5983f65618af42ee998b9348431c413fb4d89d9be7ac27abf917d8e911c5cdbcce352af5f8e72665caad912ab881c48d4083af87 WHIRLPOOL 3f95d702d0f70dcdfef26c67e1df220f5c1c336676c472ed71a7dad35790d231feb8b916a625f245702009d8a204a4be76f4184e5baf624a5d9f5cf61665dbea
 EBUILD kismet-2011.03.2-r2.ebuild 4297 SHA256 339a345ea483a8f619acbd429cc890fbf92be128b71929b93fa2b9f9b9a4fce3 SHA512 9565fbae60157af00f5ba99372391dc2c36947734e884717fbe8f5afded1edfa0b83f5cbe3c2491833287804eac8bf9fe7ce43ec4097b47e6047384bea3f9004 WHIRLPOOL 26d54e222f11b478f2609bc9036fae3fe9fc8036081a85f2daaa4a97d5b0d5c8ee5c45d259a80bc4f932f7318bd6587902763ef8c193542d21e3935725b953eb
-EBUILD kismet-2011.03.2-r3.ebuild 4341 SHA256 5660a0bee0b43a0b5e5789625b5510ee595482184e717430cb49281f9f1b1049 SHA512 dbbd4a251287995cfa4c28fc5416c0b051ba5c77e0a5fda65af4347b9d93adcc3495f97a94c211eff982a8e7b9c860860d47ec21bcf265ef05f1c17d79f2e315 WHIRLPOOL d50015de5032d546a3624d73ebced02d1ff52cb0f2297a1eeebf9075804aa476c7d0d94282fba5827dac88b04d9a427895d6346e69171d5801a9c08941e100a0
+EBUILD kismet-2011.03.2-r3.ebuild 4393 SHA256 fb587f9c0155373409089779e8f04ec82b56ee618e7561626a92a9b306145c7d SHA512 514d57b7a995ea8fd1187997f2e1c4c5725794cde2230d09ae4cda1c3f1f86e5729edb2525306dd11fe4aa1ed9c05df62edf33a0885335441251d589e2caae2c WHIRLPOOL dcd0db16fbb6655d3ba25f277ff0bb4af235bed0503f7cbaedffd6d977e4284ba5c245dd6b3c0ebc8b24a63175064fa91b93264038d19c15603692551c763afe
 EBUILD kismet-9999.ebuild 4231 SHA256 bccbd9f9ac7fdd3022571eb8ca33f3b52d5718142eed225af231e9b2107c2381 SHA512 54ea2832b9351cf960a63242b4cae485149a067bbabcb412fae78a47443f58bacc04ae2aed2847d40e78523a4df2e26ab2b015c36c431f3c8c6acc1f5956bf35 WHIRLPOOL dff1e55aad4d1c8927df1e31e817bf0123990f8f11693bb7af716c33f884e9722586e026df743da3c4f361856b10d8a445825fd0396021e8d2af035f77e8d185
-MISC ChangeLog 20343 SHA256 17fcd368a030770036880f74df4ea46c40563020dc8dbd51f00c5381aeee4095 SHA512 64a8c3176d846668009702c0ba6875138c769f7cb3ffffda7a97e5851a1a7024c6a1f3f312a99fb5f254c9e17b999ac8fffa1fd047bf2b77d3981421cabb8590 WHIRLPOOL b14ffec25b93e7002e9a80e42ac96256c7921a7c01f98cc536ac53a2a1430f36cf60c7d64068f9bc268ff3358718ac4298660f957330400aaf5a0b1701c0bd0f
+MISC ChangeLog 20525 SHA256 397d09ebd998f0cc3f315876e37e8e2691e71d78d8a96b4fbe9955da4588f6f5 SHA512 dd3ba6b5a103fb1a4e0f62a059c0d0da1480cd46d4c97bb826089ee55956184e50765ed723dee398b166212b2700164f2971c9ee1fab1a95e2976f067985c842 WHIRLPOOL 57905fc5409a6c54a738417c6d150653070d0543fa77aeb1c4663bfd492515a1b011a67f6f7d2f084f94484c9ec9f66e9bedaba64101d6ceb50976bfbf6aa47b
 MISC metadata.xml 1431 SHA256 cfec763d85e8e12bc4600ffc5c28d023aae892cef14662fd42e235d2908e6721 SHA512 4827e054ee660b8527a1b9520aa27ffec4eddc2bd40310543473e909d56f99b5f64766ece2f13073e68dabfc0e8d321fac4e21cbcc5dc10f687cc67a2ae69cc9 WHIRLPOOL 472c27cbb868775bdf3398079091a7edeca8e38a55491eb03157d9553cd98ab73a734bb5734fe53320335adb65949c92fe749c020dddf3681b3221fed52952cd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJP91U5AAoJEKXdFCfdEflKhB4QAI/gMQNelyExMXWTQ0b+J6YY
-qj57MgGDxA5GIIvmM7gu4LmTarUrETQnRxFNv/Jf6AQSSgf72qu2oU7aLjWlH/60
-y6+5LKrITS++TsOGR7H4Gobe7YBrBxbBvAPYZ7KxFTIIOL1DGUGebhYrVdDX4pJE
-Q0X63lYh3xk+0hDA8x6fJXUeXm7QRVdNSZZ5qmcptdTX42QIHWXDEC15d6l444mU
-KpT7o/K7eekr4v94cLsPw9FFv0ssn+op7tI950vAgd9pgBhDG/eGPFcpH5je9FSU
-jepycy6f3hKD0eO9otfucDMBTubhF1gx3yf6ruZ14i3q+aQlcbvgs3uM4VFUwhfc
-a4F+SQ4wAApbbCl6T0V25ao+x2b8cb4D4M8aOExZW3wHVfsYhZkJT5kxjkoIT7co
-oycGOQS6MTGSTkhsdBh0hnd4lWifUeczE/OSmLKiVTbXwKf0KywM8jN7kwE/Xwbh
-wT0XebxLA12gBzBkwuO7WhWjFLrkT+Qod8j/iw0f5YKeUbJfybekFj9ks9dqdT1t
-3FwbfGCoUCpvQi6qfJMA2KZVDipmnoWFHkq3H96xGLZjc+BIRiIlcTrVXN/7oK99
-tl96P6kqOPpEFBJUQi0utty8QDd5/aswThJ07gQNQ6KOJDmcpDwBYa9v7/Z4hNzj
-ryTbw35aSJ33RW3v+4u8
-=sCv8
------END PGP SIGNATURE-----
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() {