respect cflags and fix build for live ebuild to use new ubertooth lib

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

5 files changed, 101 insertions, 9 deletions

diff --git a/net-wireless/kismet-ubertooth/ChangeLog b/net-wireless/kismet-ubertooth/ChangeLog
index 8750aa9d71a1..6d617713e42d 100644
--- a/net-wireless/kismet-ubertooth/ChangeLog
+++ b/net-wireless/kismet-ubertooth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/kismet-ubertooth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/ChangeLog,v 1.3 2012/07/09 02:31:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/ChangeLog,v 1.4 2012/07/27 07:14:04 zerochaos Exp $
+
+  27 Jul 2012; Rick Farina <zerochaos@gentoo.org>
+  +files/kismet-ubertooth-0.0_p534-respect-cflags.patch,
+  kismet-ubertooth-0.0_p534.ebuild, kismet-ubertooth-9999.ebuild:
+  respect cflags and fix build for live ebuild to use new ubertooth lib
 
   09 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org>
   kismet-ubertooth-9999.ebuild:
diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest
index 9bae25560dad..1204f94a667d 100644
--- a/net-wireless/kismet-ubertooth/Manifest
+++ b/net-wireless/kismet-ubertooth/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX kismet-ubertooth-0.0_p534-respect-cflags.patch 2093 SHA256 96b1e4eff29d93bbd6e65ce37dddb919b7e1e9cbce1266ca040cfead5c4ccadc SHA512 b35454f098878ff7c9421c4c0dd6603baf7966406447311acacc37178662b6495cbb342c9984a006d45c82e7864f6b7eb58fc01420b482e58ed9add3169a157c WHIRLPOOL a9902b16f76d0843e12ad1bd938191ce58e8fecd1baac38d98a18147da4c12981126cc4b71a77dc01036ac4ab0eb22b59fe63ab636626765a9207f78ffca9121
 DIST ubertooth-r534.tar.gz 2959832 SHA256 5e227872ee8c088fe2cdac936c4a30d1e12b8f7c6ac781c96004ad7528b44730 SHA512 b3e150b8f8a4335f65fd8b7b629316eae08cf0560269991af6632d48e360f17dd98742da975df33852760140cd5f4571f72f36d973fa5e6d8df47932561acfa6 WHIRLPOOL 7d7ea0db033b34cbf16f963ea42d05db9bf8f82f41d5d26dd6510a95ffe339dae3fef54f5cef5d71bfedb1e05531bf33998cbcabe88af611feeaecf1e22a7b10
-EBUILD kismet-ubertooth-0.0_p534.ebuild 1489 SHA256 18b2d69654f03885dbf4959a4da32ab904d496ca7c8ae14b29868a830e6c4883 SHA512 7c87dd21c18c7778ba840b23036e80c4c3853083c50400f7b1d7d17e2c1cf133a19608a3f7003e9003ad1bd7114641a911ead745dbd178612be652cf4d75c3ad WHIRLPOOL b0280a0a244beb019a3be3776b7dca00b0c96c6cfd626b27d3883dc0ed4d2a5f3a1301c275fc421efb1f8b445e092d8aa1ea6034406ad4833079a5254bad42ee
-EBUILD kismet-ubertooth-9999.ebuild 1485 SHA256 9b775b6910fbe4eac3c21c2f4236fdcdfb2bd984e898adf782be014a6e1a8637 SHA512 ac26d531f72469fbc958292ac522afcd41f5ebb0a2ddf6611cb482c67c47428f9534512c45a58eeabcfc5b34248f6e5b79a1440c5afd374cfd054dafb18c59cf WHIRLPOOL e0cdfe48e14bf53b06aac0d4e4ded021d9ba645b77e29092b14c7e0983fe24ec2d7278f5e891b9de52b7db5abbed7952e1216666a3c115e7047f2bf4f1169ff5
-MISC ChangeLog 768 SHA256 8a305524768d1501f3fbb1c565a16268072c3c93cc70a618bc93053c8e73f982 SHA512 47531b021c6ccc2ca05e65cad15f9710243ff32527d3fa6234aa61d74c371614ebcdcf910966ff8dc08e1369db7cce5727e2494ab8594ba7a7a849efa996c23a WHIRLPOOL 8d19dc7d1be32f3751ca04db1e91758bad59831d28ef981ad92ee0d12dddf3b999afc4c081caffb6c4a1df4119049a78d074f5ff71c8d957271428810f8c993f
+EBUILD kismet-ubertooth-0.0_p534.ebuild 1563 SHA256 a83b21d635052c75df9dce4941a090ee7755f244fa3d377ced1c0fb4cc7578dc SHA512 2d24182014babbf4972240f8cb148ebd9edf2d57d69cdc08675c144d8bc1658fe65d8050784352891ed377c5daf14c2b635f3843f3a660791e02056558874926 WHIRLPOOL 10e5d4e3f46b03b6954030ad9cb4ae8055f69d59c653a03d8c0029c862233e1ced8d3c907330c83b5f83784d27c333269e2c4a9eb609ae9cf03ed022c9d8808c
+EBUILD kismet-ubertooth-9999.ebuild 1515 SHA256 1636981e90290ed5b64d193e6827c745c98967df5d58fffa6a348f83bbdf1a53 SHA512 e751633b4d541f4d0092b4ce04abbf308f64b5c662ab5c297427b6eb8af9ba7193c6645971aa949861f5b70abe80c2338067a37d8d0e5f1259882ed0b0c0fed8 WHIRLPOOL cb0496faf7306f2dc2d8ea671da0bbb5525fc311000f4c70d0a71ab5f46727279477a1f9384c2119dd3379ab2d08bf3d18678c8f4f6c93ebd771080d48973f67
+MISC ChangeLog 1014 SHA256 3be3cd8b718bca6cacc439b146f884f8dfa02d9599f0c8527096b0f5253a1da3 SHA512 aad7528074e05559aa136b314e40a6445e757aaf2d0bbf5946fa349d08a8ad659b832a8f18019d70ec9bec54779d74d0d4f36f979aca4961c448281366ca9f5f WHIRLPOOL 4f9d214e5b9d9eb02a41813e20feba74c61981ca65a932e1fb6283209d799b9e394cc9fa5405f6f11000938080534aecafc9d8d6ce2e365f6ecedc466ee05b15
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJQEkALAAoJEKXdFCfdEflKkngP/1egsaiLvVI9LEc+9oQAHZP1
+ZOxfCium1gMLQj4lvmEOSy/2gOVA2SbILKPoBZkA2el9yG5eQkN/NUxEpXDUoEdW
+vDAJeZpAHCMEXI0FTsAaC5vDZEGjXhLjnqTV93y77CiETDYuwcbCSkXIFxpgnEkY
+IrDCsEUlJFsb736SAJLKXR2oAA6ZmT/jQla84K9ZM1cxyM9PqjrHLMGPZyvsqzH5
+p4/hQeeVSySTX7v/xmUW+iBmj1yr3lcqvs0B3vnUt4yr+/mQmSLDz75mQ/UNrgp2
+rRR/0NoknH3AEPzpXZOAbBqrK5hxQCzkOMmv1675DTqdLO50WhOoayh/zzSNXyTe
+Gk4jddb9X04iaZSCyXhRziG/kwPetCEUSbxNg9pCmMQDi4eCY7rBWSE/+HJDL0F7
+5xStEnL7n5LfbnOKH28Ad3ILUnsAwssJwiCZYwC27Wo4WN9ePQMi1csLfXsDabUk
+m5vfV2LW4kFcCh1Y+cFHSk6P40ywyw3DwH+ntONpkEDmBJGGu/nrD0TvhYYifr0P
+tfMlsU/glWe8pVZceTTzs7lexNNGhG65drBgkMswGsFon0tAFphJsatgYh4GDgPC
+g/Gt/mDFsuCO5neKOx2uS72zjgB6I8/7Yvu7ELyLq5tZDcknjoGt7vl0UvPezW5C
+YFvCy86Fu6t7PrI8BrYU
+=+6qz
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/kismet-ubertooth/files/kismet-ubertooth-0.0_p534-respect-cflags.patch b/net-wireless/kismet-ubertooth/files/kismet-ubertooth-0.0_p534-respect-cflags.patch
new file mode 100644
index 000000000000..c294c3d79c59
--- /dev/null
+++ b/net-wireless/kismet-ubertooth/files/kismet-ubertooth-0.0_p534-respect-cflags.patch
@@ -0,0 +1,61 @@
+--- /var/tmp/portage/net-wireless/kismet-ubertooth-0.0_p534/work/ubertooth-r534/host/kismet/plugin-ubertooth-phyneutral/Makefile	2012-04-30 12:08:07.000000000 -0400
++++ host/kismet/plugin-ubertooth-phyneutral/Makefile	2012-07-23 12:50:07.883119040 -0400
+@@ -11,13 +11,12 @@
+ 
+ PLUGINLDFLAGS ?= $(LDFLAGS)
+ PLUGINLDFLAGS += -shared -rdynamic
+-LIBS	+= -lstdc++ -lusb-1.0 -lpthread -lbtbb
+-CFLAGS	?= $(CFLAGS) $(CPPFLAGS)
++LIBS	+= -lstdc++ -lusb-1.0 -lpthread -lbtbb -lubertooth
+ CFLAGS	+= -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
++CXXFLAGS += -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
+ 
+ SRVOBJS = packetsource_ubertooth.o packet_btbb_types.o \
+-			phy_btbb.o kismet_ubertooth.o \
+-			$(RXTX_SRC_DIR)/ubertooth.o
++			phy_btbb.o kismet_ubertooth.o
+ SRVOUT	= ubertooth.so
+ 
+ all:	$(SRVOUT)
+@@ -38,9 +37,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
+--- /var/tmp/portage/net-wireless/kismet-ubertooth-0.0_p534/work/ubertooth-r534/host/kismet/plugin-ubertooth/Makefile	2012-04-04 19:18:29.000000000 -0400
++++ host/kismet/plugin-ubertooth/Makefile	2012-07-23 12:50:07.890119040 -0400
+@@ -11,12 +11,12 @@
+ 
+ PLUGINLDFLAGS ?= $(LDFLAGS)
+ PLUGINLDFLAGS += -shared -rdynamic
+-LIBS	+= -lstdc++ -lusb-1.0 -lpthread -lbtbb
+-CFLAGS	?= $(CFLAGS) $(CPPFLAGS)
++LIBS	+= -lstdc++ -lusb-1.0 -lpthread -lbtbb -lubertooth
+ CFLAGS	+= -I/usr/include -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
++CXXFLAGS	+= -I/usr/include -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
+ 
+ SRVOBJS = packetsource_ubertooth.o packet_btbb.o packet_btbb_types.o \
+-			tracker_btbb.o kismet_ubertooth.o $(RXTX_SRC_DIR)/ubertooth.o
++			tracker_btbb.o kismet_ubertooth.o 
+ SRVOUT	= ubertooth.so
+ 
+ CLIOBJS = ubertooth_ui.o
+@@ -48,9 +48,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-ubertooth/kismet-ubertooth-0.0_p534.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild
index df2a065677c0..f2a51e2f402b 100644
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild,v 1.2 2012/07/06 21:12:10 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild,v 1.3 2012/07/27 07:14:04 zerochaos Exp $
 
 EAPI="4"
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="Provides basic bluetooth support in kismet"
 HOMEPAGE="http://ubertooth.sourceforge.net/"
@@ -31,6 +31,10 @@ DEPEND=">=net-wireless/kismet-2011.03.2-r1 \
 		>=dev-libs/libusb-1.0.0"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-cflags.patch
+}
+
 src_compile() {
 	if has_version =net-wireless/kismet-9999; then
 		cd "${S}/kismet/plugin-ubertooth-phyneutral" || die
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
index 037403bf2c37..a399ce0a05c6 100644
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.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-ubertooth/kismet-ubertooth-9999.ebuild,v 1.3 2012/07/09 02:31:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild,v 1.4 2012/07/27 07:14:04 zerochaos Exp $
 
 EAPI="4"
 
@@ -27,8 +27,9 @@ SLOT="0"
 IUSE=""
 
 DEPEND=">=net-wireless/kismet-2011.03.2-r1 \
-		>=net-libs/libbtbb-0.8 \
-		>=dev-libs/libusb-1.0.0"
+	=net-wireless/ubertooth-9999 \
+	=net-libs/libbtbb-9999 \
+	>=dev-libs/libusb-1.0.0"
 RDEPEND="${DEPEND}"
 
 src_compile() {