Fix compilation with FEATURES=confcache, bug #129479.

Package-Manager: portage-2203-svn

3 files changed, 15 insertions, 47 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index e31b9d117e33..63b870b9d92c 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.81 2006/04/30 16:44:10 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.82 2006/05/10 13:26:12 brix Exp $
+
+  10 May 2006; Henrik Brix Andersen <brix@gentoo.org>
+  kismet-2006.04.1.ebuild:
+  Fix compilation with FEATURES=confcache, bug #129479.
 
   30 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   kismet-2005.08.1-r1.ebuild:
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index f52509f65763..83569730a933 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,51 +1,13 @@
-AUX kismet-2005.08.1-acx100.patch 872 RMD160 df1b7e35ccc5bbcf4ff19df1af386c83604749b4 SHA1 37bcbf8139ddf4217e755c2a8136611fe3d5be65 SHA256 4a0caecc8d537426561c1d7dd7e5f16552a5d571c7ed671f17771253484628f6 size 872
+MD5 ce6151dd4878086b8544d39ac8b953a7 ChangeLog 12825
+MD5 5c12177987777e5929dcda25885d05a7 files/digest-kismet-2005.08.1 253
+MD5 5c12177987777e5929dcda25885d05a7 files/digest-kismet-2005.08.1-r1 253
+MD5 889bb7eab63089c4df933ecfd6b3689f files/digest-kismet-2006.04.1 70
 MD5 18f99f911134593c2ca023d3950cd833 files/kismet-2005.08.1-acx100.patch 872
-RMD160 df1b7e35ccc5bbcf4ff19df1af386c83604749b4 files/kismet-2005.08.1-acx100.patch 872
-SHA256 4a0caecc8d537426561c1d7dd7e5f16552a5d571c7ed671f17771253484628f6 files/kismet-2005.08.1-acx100.patch 872
-AUX kismet-2005.08.1-conf.d 567 RMD160 e46cb79ec3eafb4c7aa10a4e4b345e1901ed6786 SHA1 1ade604b4e2f7332d514f1369352ee8d263b92ab SHA256 5ed3e85396adaddf75d414b56d7bd89ac635404b8a77954ec524b859ba284714 size 567
 MD5 f4077a584ee7e14cd3c49a5a051a92a1 files/kismet-2005.08.1-conf.d 567
-RMD160 e46cb79ec3eafb4c7aa10a4e4b345e1901ed6786 files/kismet-2005.08.1-conf.d 567
-SHA256 5ed3e85396adaddf75d414b56d7bd89ac635404b8a77954ec524b859ba284714 files/kismet-2005.08.1-conf.d 567
-AUX kismet-2005.08.1-init.d 750 RMD160 71f7e7a0493c25b102b966f003ea70c19dbbd0e0 SHA1 b3daaefe8eba24a3d76a53799131e1d42115b37a SHA256 d9b2f3d2e80b4091322c72d48e11ef7e588e4822cafece94d282220ad4e35092 size 750
 MD5 7a04c3f78688454bd8b1609ce820c08d files/kismet-2005.08.1-init.d 750
-RMD160 71f7e7a0493c25b102b966f003ea70c19dbbd0e0 files/kismet-2005.08.1-init.d 750
-SHA256 d9b2f3d2e80b4091322c72d48e11ef7e588e4822cafece94d282220ad4e35092 files/kismet-2005.08.1-init.d 750
-AUX kismet-2006.04.1-conf.d 403 RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 SHA1 50ce39c8989ddf214f72b3ac14f2a989d6121d15 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb size 403
 MD5 b7686d6a17cc808123e939b5d6c9a746 files/kismet-2006.04.1-conf.d 403
-RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 files/kismet-2006.04.1-conf.d 403
-SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb files/kismet-2006.04.1-conf.d 403
-AUX kismet-2006.04.1-init.d 750 RMD160 ecf426992dab4e2dcf447d07a3ccf22a3e9024de SHA1 02a7676a96eabd60a8d1504bef156578ab3299cb SHA256 6d5765d53b6ed5bd24f82a4555bb787ef1a1034af26ec99488808ae126209451 size 750
 MD5 823c5af31d9f5099f246c010c59ac062 files/kismet-2006.04.1-init.d 750
-RMD160 ecf426992dab4e2dcf447d07a3ccf22a3e9024de files/kismet-2006.04.1-init.d 750
-SHA256 6d5765d53b6ed5bd24f82a4555bb787ef1a1034af26ec99488808ae126209451 files/kismet-2006.04.1-init.d 750
-DIST kismet-2005-08-R1.tar.gz 986388 RMD160 1ee1b376d70821e7a4ccc5197ca299c0ebd6f250 SHA256 27e657212881186d356907a7c45b168e7431a2f83f3411d2a90366afccf03916 size 986388
-DIST kismet-2006-04-R1.tar.gz 1005068 size 1005068
-EBUILD kismet-2005.08.1-r1.ebuild 1622 RMD160 b738b8aa41630e6e5c4b6edb31e39a6b89f00ebe SHA1 a384bab889a8d0056e573e621c6763573b625996 SHA256 ca4e14cce6ce50a5676b526d3b7c9f47170ca303b4396968fb0acdb3426fad94 size 1622
 MD5 d9e6830bae54cf278a40029ec37b5009 kismet-2005.08.1-r1.ebuild 1622
-RMD160 b738b8aa41630e6e5c4b6edb31e39a6b89f00ebe kismet-2005.08.1-r1.ebuild 1622
-SHA256 ca4e14cce6ce50a5676b526d3b7c9f47170ca303b4396968fb0acdb3426fad94 kismet-2005.08.1-r1.ebuild 1622
-EBUILD kismet-2005.08.1.ebuild 1561 RMD160 db6200b59875b184f57d1fc2c84dcbe1284f618b SHA1 0a9362c42c2502e0c65c3781963c989667d58cc2 SHA256 89aededff67bb0f004019b9d72717af38cab9d696e2debbecbfe1355f0e2436d size 1561
 MD5 2432957f297922877997a8bdee4421c5 kismet-2005.08.1.ebuild 1561
-RMD160 db6200b59875b184f57d1fc2c84dcbe1284f618b kismet-2005.08.1.ebuild 1561
-SHA256 89aededff67bb0f004019b9d72717af38cab9d696e2debbecbfe1355f0e2436d kismet-2005.08.1.ebuild 1561
-EBUILD kismet-2006.04.1.ebuild 1561 RMD160 d53e30b0c9ae28da9dd7a8995b6dbeda721a1fad SHA1 f7b7bf9a9a7c6433d9b6c629e8ba3fa245b02ee9 SHA256 8d2e58276be154a77ef9e6389e3762d5c1b117fb44873acd0be3d1caaf6f80f7 size 1561
-MD5 83f8d230bbd56e2f99afeb4fc086364e kismet-2006.04.1.ebuild 1561
-RMD160 d53e30b0c9ae28da9dd7a8995b6dbeda721a1fad kismet-2006.04.1.ebuild 1561
-SHA256 8d2e58276be154a77ef9e6389e3762d5c1b117fb44873acd0be3d1caaf6f80f7 kismet-2006.04.1.ebuild 1561
-MISC ChangeLog 12693 RMD160 6b3de617d221b387f21ad39e3fc638812f8cd2d4 SHA1 bf46280d3842a9f99b2d8dbc04d4b20500071e3f SHA256 6ba97740355232e46334f26280b4c4907f69aa871dffec67ce162c3b873689ba size 12693
-MD5 2cf35683e5dd06cc9a7e4432a0bb1a60 ChangeLog 12693
-RMD160 6b3de617d221b387f21ad39e3fc638812f8cd2d4 ChangeLog 12693
-SHA256 6ba97740355232e46334f26280b4c4907f69aa871dffec67ce162c3b873689ba ChangeLog 12693
-MISC metadata.xml 348 RMD160 76047ab0383b6e8914a48b65d50c131247b791b8 SHA1 1b89778718fc94ba5dc0390a631048f5a8d45f85 SHA256 16b5fcc0d0fd4059fed5e0c30a222c4b564e41a99770baa6404dd7ac236099b7 size 348
+MD5 4dca06aebdae8a8b3f5bb6a6e9e03457 kismet-2006.04.1.ebuild 1675
 MD5 ffabe8240a5956794f085602c98e8598 metadata.xml 348
-RMD160 76047ab0383b6e8914a48b65d50c131247b791b8 metadata.xml 348
-SHA256 16b5fcc0d0fd4059fed5e0c30a222c4b564e41a99770baa6404dd7ac236099b7 metadata.xml 348
-MD5 5c12177987777e5929dcda25885d05a7 files/digest-kismet-2005.08.1 253
-RMD160 9b2c7681f7d656f5c5dae0b57fa335716f51be0a files/digest-kismet-2005.08.1 253
-SHA256 648006dd9b359d2dcd962fc01cafdd382d53ba75fc03a3dc040a9c7e7219b738 files/digest-kismet-2005.08.1 253
-MD5 5c12177987777e5929dcda25885d05a7 files/digest-kismet-2005.08.1-r1 253
-RMD160 9b2c7681f7d656f5c5dae0b57fa335716f51be0a files/digest-kismet-2005.08.1-r1 253
-SHA256 648006dd9b359d2dcd962fc01cafdd382d53ba75fc03a3dc040a9c7e7219b738 files/digest-kismet-2005.08.1-r1 253
-MD5 889bb7eab63089c4df933ecfd6b3689f files/digest-kismet-2006.04.1 70
-RMD160 4d132b9e7d5246c6d4da41f195021769ec2ca230 files/digest-kismet-2006.04.1 70
-SHA256 07c2ea53ed9a3b7b81ee0c4b9422ed03e3fbc7c4b35cb2278c29b068a219dc70 files/digest-kismet-2006.04.1 70
diff --git a/net-wireless/kismet/kismet-2006.04.1.ebuild b/net-wireless/kismet/kismet-2006.04.1.ebuild
index 2b1ed2f8f03e..b9746e71ad4e 100644
--- a/net-wireless/kismet/kismet-2006.04.1.ebuild
+++ b/net-wireless/kismet/kismet-2006.04.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2006.04.1.ebuild,v 1.1 2006/04/14 11:33:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2006.04.1.ebuild,v 1.2 2006/05/10 13:26:12 brix Exp $
 
-inherit linux-info
+inherit toolchain-funcs linux-info
 
 MY_P=${P/\./-}
 MY_P=${MY_P/./-R}
@@ -47,7 +47,9 @@ src_compile() {
 		config="${config} --disable-gpsmap"
 	fi
 
-	econf \
+	# need to set CC and CXX for FEATURES=confcache, bug #129479
+	CC=$(tc-getCC) CXX=$(tc-getCXX) \
+		econf \
 		${config} \
 		--with-linuxheaders=${KV_DIR}/include \
 		|| die "econf failed"