Move need-wxwidgets into src_compile. Portage seems to be dropping the value

of WX_CONFIG gotten from wxwidgets.eclass between phases. Also fix variable
quoting.
Package-Manager: portage-2.1.3.12

4 files changed, 72 insertions, 56 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 3782a0c706fc..e569f71da75e 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.93 2007/09/29 00:07:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.94 2007/10/13 16:16:45 dirtyepic Exp $
+
+  13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> amule-2.1.3.ebuild,
+  amule-2.2.0_pre20070422.ebuild:
+  Move need-wxwidgets into src_compile. Portage seems to be dropping the value
+  of WX_CONFIG gotten from wxwidgets.eclass between phases. Also fix variable
+  quoting.
 
   29 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> amule-2.1.3.ebuild,
   amule-2.2.0_pre20070422.ebuild:
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 727dfaa63a5f..8df1e560e1f6 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 files/amuled.confd 409
@@ -16,18 +19,18 @@ RMD160 278b66c90ab82e37cb43a5ddbcdf599afd570a95 files/amuleweb.initd 1171
 SHA256 a4826cb4294184ac12fd712517397074fcf71a132640789132d761488b32b2da files/amuleweb.initd 1171
 DIST aMule-2.1.3.tar.bz2 3248530 RMD160 fcc345000e5ad0a221d1e96d0d514f3be36428c3 SHA1 dd47deb38e7a5b823550b85150f5a814c597b273 SHA256 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
 DIST aMule-CVS-20070422.tar.bz2 3406102 RMD160 ab2912e5e07c6690a854682373107c532715faea SHA1 d0e519849d5e44d6d73940af505a209fa6fdff9c SHA256 f5a532da419a6a78238144588bb420c4cbd7b1113ea05000abf8a29b3202ac1a
-EBUILD amule-2.1.3.ebuild 3007 RMD160 e0955779b2784c294b801f3075d31d61f007fcd3 SHA1 a142c5bb67d8bd0dc00a309705fc1c4cb6b3c215 SHA256 57ac3883cd932df3d0ad70ecae04b4ae2c91bc4942ff03951f310bcc5c2a639e
-MD5 3ecaa171584f0371a83f83ea8d6e4b5d amule-2.1.3.ebuild 3007
-RMD160 e0955779b2784c294b801f3075d31d61f007fcd3 amule-2.1.3.ebuild 3007
-SHA256 57ac3883cd932df3d0ad70ecae04b4ae2c91bc4942ff03951f310bcc5c2a639e amule-2.1.3.ebuild 3007
-EBUILD amule-2.2.0_pre20070422.ebuild 2947 RMD160 96ac18a5fbfb72373a6da9063b9284fd9ebee8e0 SHA1 d87aca994d2aeca3eb18a55a3426a62c95766362 SHA256 e849786a13c0dccd09819a549772046de952accb048082a2d5b8c1a42fa91ba7
-MD5 66f49bd566d4b7e57a729ab3eba63d48 amule-2.2.0_pre20070422.ebuild 2947
-RMD160 96ac18a5fbfb72373a6da9063b9284fd9ebee8e0 amule-2.2.0_pre20070422.ebuild 2947
-SHA256 e849786a13c0dccd09819a549772046de952accb048082a2d5b8c1a42fa91ba7 amule-2.2.0_pre20070422.ebuild 2947
-MISC ChangeLog 13193 RMD160 f40d642646a813d28c361c10c62a3cb47b0b3e90 SHA1 2d58c868969da94b988b6a0826120a36f8e675e3 SHA256 85e810c46ebfdb7d930abd87be128432abd6616dd092a480b1b2dcb2f891f4f3
-MD5 d38fa60661d2f6e0d1f94597121009bd ChangeLog 13193
-RMD160 f40d642646a813d28c361c10c62a3cb47b0b3e90 ChangeLog 13193
-SHA256 85e810c46ebfdb7d930abd87be128432abd6616dd092a480b1b2dcb2f891f4f3 ChangeLog 13193
+EBUILD amule-2.1.3.ebuild 3008 RMD160 d33362a16feac0a0d4b05aa7988247a4ed51c9d8 SHA1 2eeb055c47a689f73214a8a5d4e9814004d3f652 SHA256 ae1e16d6f43cb4a76fcc443f96c879e734ca2ee7d8a46f32409bde06d138b95a
+MD5 7bf9166f8ab91ccca4c9daa5ed986e1f amule-2.1.3.ebuild 3008
+RMD160 d33362a16feac0a0d4b05aa7988247a4ed51c9d8 amule-2.1.3.ebuild 3008
+SHA256 ae1e16d6f43cb4a76fcc443f96c879e734ca2ee7d8a46f32409bde06d138b95a amule-2.1.3.ebuild 3008
+EBUILD amule-2.2.0_pre20070422.ebuild 2948 RMD160 ea319654a810d3b7802085dc5fbb6b5b15682042 SHA1 4d6bd0695f391a38d88562a4fbbfd5d0e18def35 SHA256 faaaea48e0712cc94b367078275c6374d342d63847c5e5a644ba4961c5b37eae
+MD5 e79e89300edc7a2db58e994626305daf amule-2.2.0_pre20070422.ebuild 2948
+RMD160 ea319654a810d3b7802085dc5fbb6b5b15682042 amule-2.2.0_pre20070422.ebuild 2948
+SHA256 faaaea48e0712cc94b367078275c6374d342d63847c5e5a644ba4961c5b37eae amule-2.2.0_pre20070422.ebuild 2948
+MISC ChangeLog 13464 RMD160 e5798d103ef2d8ad71289773d2baca736859da13 SHA1 cbac40e1dfcc967e0eb4f09bc0834966dbc89982 SHA256 c4a5e5a86bee3fdedde5decf62d6961d6ec88ef18531d39430eca51347442211
+MD5 703ef7c889eba043e37377a0e1bfe657 ChangeLog 13464
+RMD160 e5798d103ef2d8ad71289773d2baca736859da13 ChangeLog 13464
+SHA256 c4a5e5a86bee3fdedde5decf62d6961d6ec88ef18531d39430eca51347442211 ChangeLog 13464
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
@@ -38,3 +41,10 @@ SHA256 697b2e19feb57659e95a0738fd32752cc3d37a72220659ce30912da1a505bf05 files/di
 MD5 7d2d1c5bf992dc2a4e567a5d113e610d files/digest-amule-2.2.0_pre20070422 262
 RMD160 3ead8b0c804be6003401be6305cfd5da0f4b3e00 files/digest-amule-2.2.0_pre20070422 262
 SHA256 e9ff9cba3490cc018a81ad5323dfa2a327353e884768383d1577353f6cd7f1a7 files/digest-amule-2.2.0_pre20070422 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHEO96iqiDRvmkBmIRApcIAJ9r9FNQRVgRqcgPFK8iPIysTO+1VwCfYrJO
+GiKgLVoX8cSE3AXmiwNUBJM=
+=vkuk
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.1.3.ebuild b/net-p2p/amule/amule-2.1.3.ebuild
index 0becdbd0f541..1fa5d8592ddc 100644
--- a/net-p2p/amule/amule-2.1.3.ebuild
+++ b/net-p2p/amule/amule-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.14 2007/09/29 00:07:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.15 2007/10/13 16:16:45 dirtyepic Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -23,8 +23,6 @@ DEPEND="=x11-libs/wxGTK-2.6*
 			unicode? ( >=media-libs/gd-2.0.26 ) )"
 
 pkg_setup() {
-		export WX_GTK_VER="2.6"
-
 		if ! use gtk && ! use remote && ! use amuled; then
 				eerror ""
 				eerror "You have to specify at least one of gtk, remote or amuled"
@@ -33,20 +31,6 @@ pkg_setup() {
 				die "Invalid USE flag set"
 		fi
 
-		if use unicode && use gtk; then
-				einfo "wxGTK with gtk2 and unicode support will be used"
-				need-wxwidgets unicode
-		elif use gtk; then
-				einfo "wxGTK with gtk2 support will be used"
-				need-wxwidgets gtk2
-		elif use unicode; then
-				einfo "wxGTK with unicode and without X support will be used"
-				need-wxwidgets base-unicode
-		else
-				einfo "wxGTK without X support will be used"
-				need-wxwidgets base
-		fi
-
 		if use stats && ! use gtk; then
 				einfo "Note: You would need both the gtk and stats USE flags"
 				einfo "to compile aMule Statistics GUI."
@@ -66,7 +50,23 @@ pkg_preinst() {
 }
 
 src_compile() {
-		local myconf=""
+		local myconf
+
+		WX_GTK_VER="2.6"
+
+		if use unicode && use gtk; then
+				einfo "wxGTK with gtk2 and unicode support will be used"
+				need-wxwidgets unicode
+		elif use gtk; then
+				einfo "wxGTK with gtk2 support will be used"
+				need-wxwidgets gtk2
+		elif use unicode; then
+				einfo "wxGTK with unicode and without X support will be used"
+				need-wxwidgets base-unicode
+		else
+				einfo "wxGTK without X support will be used"
+				need-wxwidgets base
+		fi
 
 		if use gtk ; then
 				use stats && myconf="${myconf}
@@ -102,15 +102,15 @@ src_compile() {
 }
 
 src_install() {
-		make DESTDIR=${D} install || die
+		emake DESTDIR="${D}" install || die
 
 		if use amuled; then
-				newconfd ${FILESDIR}/amuled.confd amuled
-				newinitd ${FILESDIR}/amuled.initd amuled
+				newconfd "${FILESDIR}"/amuled.confd amuled
+				newinitd "${FILESDIR}"/amuled.initd amuled
 		fi
 
 		if use remote; then
-				newconfd ${FILESDIR}/amuleweb.confd amuleweb
-				newinitd ${FILESDIR}/amuleweb.initd amuleweb
+				newconfd "${FILESDIR}"/amuleweb.confd amuleweb
+				newinitd "${FILESDIR}"/amuleweb.initd amuleweb
 		fi
 }
diff --git a/net-p2p/amule/amule-2.2.0_pre20070422.ebuild b/net-p2p/amule/amule-2.2.0_pre20070422.ebuild
index 3335400e1515..dbca1e79f510 100644
--- a/net-p2p/amule/amule-2.2.0_pre20070422.ebuild
+++ b/net-p2p/amule/amule-2.2.0_pre20070422.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070422.ebuild,v 1.2 2007/09/29 00:07:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070422.ebuild,v 1.3 2007/10/13 16:16:45 dirtyepic Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -23,8 +23,6 @@ DEPEND="=x11-libs/wxGTK-2.6*
 			unicode? ( >=media-libs/gd-2.0.26 ) )"
 
 pkg_setup() {
-		export WX_GTK_VER="2.6"
-
 		if ! use gtk && ! use remote && ! use amuled; then
 				eerror ""
 				eerror "You have to specify at least one of gtk, remote or amuled"
@@ -33,17 +31,6 @@ pkg_setup() {
 				die "Invalid USE flag set"
 		fi
 
-		if use gtk; then
-				einfo "wxGTK with gtk2 and unicode support will be used"
-				need-wxwidgets unicode
-		elif use unicode; then
-				einfo "wxGTK with unicode and without X support will be used"
-				need-wxwidgets base-unicode
-		else
-				einfo "wxGTK without X support will be used"
-				need-wxwidgets base
-		fi
-
 		if use stats && ! use gtk; then
 				einfo "Note: You would need both the gtk and stats USE flags"
 				einfo "to compile aMule Statistics GUI."
@@ -63,7 +50,20 @@ pkg_preinst() {
 }
 
 src_compile() {
-		local myconf=""
+		local myconf
+
+		WX_GTK_VER="2.6"
+
+		if use gtk; then
+				einfo "wxGTK with gtk2 and unicode support will be used"
+				need-wxwidgets unicode
+		elif use unicode; then
+				einfo "wxGTK with unicode and without X support will be used"
+				need-wxwidgets base-unicode
+		else
+				einfo "wxGTK without X support will be used"
+				need-wxwidgets base
+		fi
 
 		if use gtk ; then
 				use stats && myconf="${myconf}
@@ -99,15 +99,15 @@ src_compile() {
 }
 
 src_install() {
-		make DESTDIR=${D} install || die
+		emake DESTDIR="${D}" install || die
 
 		if use amuled; then
-				newconfd ${FILESDIR}/amuled.confd amuled
-				newinitd ${FILESDIR}/amuled.initd amuled
+				newconfd "${FILESDIR}"/amuled.confd amuled
+				newinitd "${FILESDIR}"/amuled.initd amuled
 		fi
 
 		if use remote; then
-				newconfd ${FILESDIR}/amuleweb.confd amuleweb
-				newinitd ${FILESDIR}/amuleweb.initd amuleweb
+				newconfd "${FILESDIR}"/amuleweb.confd amuleweb
+				newinitd "${FILESDIR}"/amuleweb.initd amuleweb
 		fi
 }