Don't hardcode path to qmake, #182867 thanks to Thomas Capricelli.

Package-Manager: portage-2.1.3_rc5

4 files changed, 25 insertions, 21 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 4b44ababb6c8..8a9f85b45e72 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.95 2007/06/19 07:54:17 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.96 2007/06/29 07:47:07 uberlord Exp $
+
+  29 Jun 2007; Roy Marples <uberlord@gentoo.org>
+  wpa_supplicant-0.5.7.ebuild, wpa_supplicant-0.6.0.ebuild:
+  Don't hardcode path to qmake, #182867 thanks to Thomas Capricelli.
 
   19 Jun 2007; Stefan Schweizer <genstef@gentoo.org>
   wpa_supplicant-0.5.7.ebuild, wpa_supplicant-0.6.0.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 0875e8d48093..75910709a578 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -12,18 +12,18 @@ RMD160 591d852e8993648793f717402c7b5c52e1f54b71 files/wpa_supplicant.conf 183
 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a files/wpa_supplicant.conf 183
 DIST wpa_supplicant-0.5.7.tar.gz 713251 RMD160 dffc3b5cbead92757840f71ccdd4548348698b28 SHA1 43f769d46fdca47b024e777331fb00577595c0ef SHA256 cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57
 DIST wpa_supplicant-0.6.0.tar.gz 842023 RMD160 17ba4903389a00527de772072dcd8e234d759fe9 SHA1 966dc49c5c2386d58696515ee8b20b1f4f45cd85 SHA256 24ce7873cbf2b23c00f931dd7f20326bea5463dd2a50a865b3d9bffd3f5780b7
-EBUILD wpa_supplicant-0.5.7.ebuild 6245 RMD160 550eac66c7033da4158f80f0c3708b9afb230838 SHA1 94282d3e8407e45a2ba84ddf426ee9f5c56a737b SHA256 c0fbab77696533a5cf4ca0f679a495abdba91ad76082c2bbf4ee8314a0fbe625
-MD5 0c72a5138453d4d0e73207709cba77fa wpa_supplicant-0.5.7.ebuild 6245
-RMD160 550eac66c7033da4158f80f0c3708b9afb230838 wpa_supplicant-0.5.7.ebuild 6245
-SHA256 c0fbab77696533a5cf4ca0f679a495abdba91ad76082c2bbf4ee8314a0fbe625 wpa_supplicant-0.5.7.ebuild 6245
-EBUILD wpa_supplicant-0.6.0.ebuild 6254 RMD160 e85d69e304d1553e91b3e27e1483d6870ceb653b SHA1 fbc9831dc98a1eee35829256c950dfcbdea2d207 SHA256 08ea4d3cc22dfb7ae677e0e7c321ac9e36c849fffc23af93506dba38e442ca05
-MD5 1a6b42d27fed96a18fb7812964771f9d wpa_supplicant-0.6.0.ebuild 6254
-RMD160 e85d69e304d1553e91b3e27e1483d6870ceb653b wpa_supplicant-0.6.0.ebuild 6254
-SHA256 08ea4d3cc22dfb7ae677e0e7c321ac9e36c849fffc23af93506dba38e442ca05 wpa_supplicant-0.6.0.ebuild 6254
-MISC ChangeLog 21153 RMD160 f716e686b371201c12d005b0098f345d4e1e0fb2 SHA1 0bf09a8613d08cf49e9d6f58d9177422eba46113 SHA256 e6677ddc1ef7bbcedd9d9a1952d79b118e4722e5de8cb3e77c45f114b6bcc1dc
-MD5 0e5a06096751dcb12a031697471017d0 ChangeLog 21153
-RMD160 f716e686b371201c12d005b0098f345d4e1e0fb2 ChangeLog 21153
-SHA256 e6677ddc1ef7bbcedd9d9a1952d79b118e4722e5de8cb3e77c45f114b6bcc1dc ChangeLog 21153
+EBUILD wpa_supplicant-0.5.7.ebuild 6253 RMD160 2a8507de98283c8a1ac198f5bfd6516cbdca54b5 SHA1 d156f3e39da5fd18ef206aa133aa1f3af62b9d9e SHA256 e40e3eddf2a068a2fd9622265332c02d36fd88197389c615a30ca9dae1724827
+MD5 686dfb154c56cef5e46640e50d7b193e wpa_supplicant-0.5.7.ebuild 6253
+RMD160 2a8507de98283c8a1ac198f5bfd6516cbdca54b5 wpa_supplicant-0.5.7.ebuild 6253
+SHA256 e40e3eddf2a068a2fd9622265332c02d36fd88197389c615a30ca9dae1724827 wpa_supplicant-0.5.7.ebuild 6253
+EBUILD wpa_supplicant-0.6.0.ebuild 6262 RMD160 d4668b975cc873aaa12c9defbe4e085c43c9360d SHA1 9569bbca4ff4da8ed7df69c54ea20044fecb887e SHA256 bb97d14470e8a20f31864c236afc85b5ec2952331178fb2f715f26ede1850c2e
+MD5 5e7b83e009092d461156d5fe32ff69d3 wpa_supplicant-0.6.0.ebuild 6262
+RMD160 d4668b975cc873aaa12c9defbe4e085c43c9360d wpa_supplicant-0.6.0.ebuild 6262
+SHA256 bb97d14470e8a20f31864c236afc85b5ec2952331178fb2f715f26ede1850c2e wpa_supplicant-0.6.0.ebuild 6262
+MISC ChangeLog 21333 RMD160 04ff924801869c2bfa3c82f589b6c4d23fab1caa SHA1 b715f7d45eb1feedf2f76e8d3c7b40432a43862c SHA256 3cc2546827528862103013a671bbb2f5c2d4e6be89930ff0a3710a876c9a4df2
+MD5 822d31c50f9f606e2230ce6bfd657a04 ChangeLog 21333
+RMD160 04ff924801869c2bfa3c82f589b6c4d23fab1caa ChangeLog 21333
+SHA256 3cc2546827528862103013a671bbb2f5c2d4e6be89930ff0a3710a876c9a4df2 ChangeLog 21333
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
index 0dd437f74837..fa1476ad411b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild,v 1.6 2007/06/19 07:54:17 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild,v 1.7 2007/06/29 07:47:07 uberlord Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils qt3 toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
@@ -151,8 +151,8 @@ src_compile() {
 		cd "${S}"/wpa_gui-qt4
 		emake || die "emake wpa_gui-qt4 failed"
 	elif use qt3 ; then
-		[[ -d ${QTDIR}/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
-		/usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
+		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
+		"${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
 		cd "${S}"/wpa_gui
 		emake || die "emake wpa_gui failed"
 	fi
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild
index 0de295fb632b..9337d3ef12d9 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild,v 1.2 2007/06/19 07:54:17 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild,v 1.3 2007/06/29 07:47:07 uberlord Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils qt3 toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
@@ -151,8 +151,8 @@ src_compile() {
 		cd "${S}"/wpa_gui-qt4
 		emake || die "emake wpa_gui-qt4 failed"
 	elif use qt3 ; then
-		[[ -d ${QTDIR}/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
-		/usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
+		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
+		"${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
 		cd "${S}"/wpa_gui
 		emake || die "emake wpa_gui failed"
 	fi