dont set mycmakeargs at global scope

Package-Manager: portage-2.1.5_rc5

4 files changed, 30 insertions, 19 deletions

diff --git a/media-sound/traverso/ChangeLog b/media-sound/traverso/ChangeLog
index 7beebd680061..19aa0b98353f 100644
--- a/media-sound/traverso/ChangeLog
+++ b/media-sound/traverso/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/traverso
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.18 2008/04/20 17:38:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.19 2008/04/20 17:42:12 aballier Exp $
+
+  20 Apr 2008; Alexis Ballier <aballier@gentoo.org> traverso-0.42.0.ebuild,
+  traverso-9999.ebuild:
+  dont set mycmakeargs at global scope
 
   20 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   +files/traverso-0.42.0-gcc43.patch, traverso-0.42.0.ebuild:
diff --git a/media-sound/traverso/Manifest b/media-sound/traverso/Manifest
index 3764266d9773..926ccc05885b 100644
--- a/media-sound/traverso/Manifest
+++ b/media-sound/traverso/Manifest
@@ -5,14 +5,14 @@ AUX traverso-0.42.0-gcc43.patch 978 RMD160 77a177b37d181e79f6eec33d48669276392c6
 AUX traverso-0.42.0-nojack.patch 478 RMD160 7adccdca6f50aeed844e548565d81d16bd83c991 SHA1 7c5d65bb3e3649684e1d0cb6ff7b019b7443ee08 SHA256 ed3870c7107b6e0d2186ff63807db15e77afd3c404320df48b195b456a2d4c0f
 AUX traverso-0.42.0-strictaliasing.patch 589 RMD160 0ef04844908ff193912245c307c2d3599f077e20 SHA1 e67161bc7b92ca616f5f22b141334e3d7d437815 SHA256 ebf8ff9b48249c173a449833921528451ab13f9106bced7c30fad0fd7c925237
 DIST traverso-0.42.0.tar.gz 874836 RMD160 83adf7686da7e192a253677c904f5786e39fafe9 SHA1 7ad1c4555f93b380e44ce2941cbc88babc5f1064 SHA256 b91d1f536dcd3eb5f48a881c2b3da957e02f4f96a5573f6ca2d173347ed74be8
-EBUILD traverso-0.42.0.ebuild 1921 RMD160 763518ffd1cd0ecd0b8bc05659e765649aa5145c SHA1 b189e683d22918e09ee5b9d4b1bd1a042e3ce20d SHA256 f76d266cab21eadb94fbc8365eec0c5b25a391e0e133bce460b527a51aa0e25c
-EBUILD traverso-9999.ebuild 1895 RMD160 38b3cdc018ff735d9c4be124eb175fdf8c20d98c SHA1 8b5e372399bb29ec8888c9d0f34ed2d0c464941d SHA256 3df12c65b6ca10dc7bed470f94ad358a953de79adbc8fc879b394a9901f4f64c
-MISC ChangeLog 2859 RMD160 6c132d950fc0de883e1fad87c5f0b422f7ca7c39 SHA1 c293949d680d1f195e8d2921ff30f6522ea9695f SHA256 a96897cb2c08e609e7d42eaed3d8b1d5efb3fa296b612f7bc3c9e490f8048b9e
+EBUILD traverso-0.42.0.ebuild 1974 RMD160 c4d9b1f0f7a000322796c3e693f86261ed08a9d2 SHA1 86dd7195fab101448785322bb15639bead081415 SHA256 0041a34f0007a3922112031c8fac0cf901296daf668d507b8b69d1ad78bdd84e
+EBUILD traverso-9999.ebuild 1949 RMD160 4036f6abe31f7918a0f25148123dc9f80814f762 SHA1 6fbd9ad069291e4b3bf945643e16408c4655f7f5 SHA256 52ab39a8e3279f1a431bedbfa2827532a0ab4021e73455441673df58587a031d
+MISC ChangeLog 2999 RMD160 d4bfeeaf79ea47a50f7133f414fec13063d1c107 SHA1 d2df32ae523bd8cb5c9bc2caa30248d8e350b89a SHA256 aaf8d81b43dae8b726016c9a175827cad067e49f5a82904b6d365c558a88d853
 MISC metadata.xml 482 RMD160 85dabe14d3dd570865bbc41511054c4700674aba SHA1 0f464cbaec8d3f50685faeaf31d62bb4a13808a2 SHA256 79ac631b510a2d0cc554e1c1cba25bdc0009f48e1383dc48242697239083df3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgLf5AACgkQvFcC4BYPU0rXdgCgjL2VzMq004LDAD1BQ4K1TNYc
-wlIAoK3QjxKtDZXpQDMb9kLgYeNvEW4P
-=x99I
+iEYEARECAAYFAkgLgIIACgkQvFcC4BYPU0o+cQCeKDK9cpPh9+0H7iwNh0b5UPft
+D18AoK0cZ5X0YOdDDRTpoibxc4xNmXp0
+=hJed
 -----END PGP SIGNATURE-----
diff --git a/media-sound/traverso/traverso-0.42.0.ebuild b/media-sound/traverso/traverso-0.42.0.ebuild
index 6b141c7dc7de..7c98421b3024 100644
--- a/media-sound/traverso/traverso-0.42.0.ebuild
+++ b/media-sound/traverso/traverso-0.42.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.42.0.ebuild,v 1.3 2008/04/20 17:38:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.42.0.ebuild,v 1.4 2008/04/20 17:42:12 aballier Exp $
 
 inherit eutils qt4 cmake-utils
 
@@ -36,11 +36,6 @@ pkg_setup() {
 	fi
 }
 
-mycmakeargs="$(cmake-utils_use_want jack JACK) $(cmake-utils_use_want alsa ALSA) \
-	$(cmake-utils_use_want lv2 LV2) -DUSE_SYSTEM_SLV2_LIBRARY=ON \
-	$(cmake-utils_use_want mad MP3_DECODE) $(cmake-utils_use_want lame MP3_ENCODE) \
-	$(cmake-utils_use_want opengl OPENGL) $(cmake-utils_use_want debug TRAVERSO_DEBUG)"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -50,6 +45,14 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
+src_compile() {
+	local mycmakeargs="$(cmake-utils_use_want jack JACK) $(cmake-utils_use_want alsa ALSA) \
+		$(cmake-utils_use_want lv2 LV2) -DUSE_SYSTEM_SLV2_LIBRARY=ON \
+		$(cmake-utils_use_want mad MP3_DECODE) $(cmake-utils_use_want lame MP3_ENCODE) \
+		$(cmake-utils_use_want opengl OPENGL) $(cmake-utils_use_want debug TRAVERSO_DEBUG)"
+	cmake-utils_src_compile
+}
+
 src_install() {
 	cmake-utils_src_install
 	dodoc AUTHORS ChangeLog README resources/help.text
diff --git a/media-sound/traverso/traverso-9999.ebuild b/media-sound/traverso/traverso-9999.ebuild
index ff1463774d3c..72207615c96f 100644
--- a/media-sound/traverso/traverso-9999.ebuild
+++ b/media-sound/traverso/traverso-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-9999.ebuild,v 1.2 2008/01/13 13:10:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-9999.ebuild,v 1.3 2008/04/20 17:42:12 aballier Exp $
 
 inherit eutils qt4 cmake-utils cvs
 
@@ -36,11 +36,6 @@ pkg_setup() {
 	fi
 }
 
-mycmakeargs="$(cmake-utils_use_want jack JACK) $(cmake-utils_use_want alsa ALSA) \
-	$(cmake-utils_use_want lv2 LV2) -DUSE_SYSTEM_SLV2_LIBRARY=ON \
-	$(cmake-utils_use_want mad MP3_DECODE) $(cmake-utils_use_want lame MP3_ENCODE) \
-	$(cmake-utils_use_want opengl OPENGL) $(cmake-utils_use_want debug TRAVERSO_DEBUG)"
-
 ECVS_SERVER="cvs.savannah.nongnu.org:/sources/traverso"
 ECVS_USER="anonymous"
 ECVS_PASS=""
@@ -49,6 +44,15 @@ ECVS_MODULE="traverso"
 
 S="${WORKDIR}/${PN}"
 
+src_compile() {
+	local mycmakeargs="$(cmake-utils_use_want jack JACK) $(cmake-utils_use_want alsa ALSA) \
+		$(cmake-utils_use_want lv2 LV2) -DUSE_SYSTEM_SLV2_LIBRARY=ON \
+		$(cmake-utils_use_want mad MP3_DECODE) $(cmake-utils_use_want lame MP3_ENCODE) \
+		$(cmake-utils_use_want opengl OPENGL) $(cmake-utils_use_want debug TRAVERSO_DEBUG)"
+	cmake-utils_src_compile
+}
+
+
 src_install() {
 	cmake-utils_src_install
 	dodoc AUTHORS ChangeLog README resources/help.text