Fix usage of python_set_active_version().

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

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index a626a8af8c267f40f725d382e537e0f71a622e0c..9678cbba255638eb26b46f69a1135277c611449f 100644 (file)
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.85 2010/06/17 07:28:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.86 2010/06/17 14:22:58 arfrever Exp $
+
+  17 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  grass-6.4.0_rc6.ebuild:
+  Fix usage of python_set_active_version().
 
   17 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   files/grass-6.4.0_rc6-html-nonviz.patch:

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4db730919c1ae0388858a73e71303337fcebc7b0..429cf49ef4342bf1eaa42e87eeb5ce6fb1da55f0 100644 (file)
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0 SHA1 1ce70dbb99f64419361816a75e6948d8960d4f4f SHA256 210e7f7f34ec04caf41bd312f5c90c7be206656766e98725f27185e0c8759f80
 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
 AUX grass-6.3.0-o_creat.patch 1469 RMD160 dd2cec8103c07eabd906f3792544bf2225cb1287 SHA1 3bb27a3069abb47b3ac6a9480c508a036d1f3aba SHA256 b9bb9ea09414fbcb00b52520cd4e98147d3de199401efe9996eb6f911fd7ef05
@@ -13,13 +10,6 @@ DIST grass-6.4.0RC5.tar.gz 21087594 RMD160 3fa11d2672a4717a7f348cec3810bcbe51700
 DIST grass-6.4.0RC6.tar.gz 22598465 RMD160 6c8a0cd56b72b11395cf97953bc74672939225f3 SHA1 4e82d7211ac85dbefa15ff27397d896d1955db64 SHA256 5f550abf05e65ac91ef38aa249d6de62774bfda1fae02a7ac0a4652284ea6c10
 EBUILD grass-6.3.0.ebuild 8471 RMD160 2e0c2edc7138860f3b09544017a782b54378d4de SHA1 e1fc7fcd1755da668581f5085c0e7eb9179c1eb4 SHA256 ce5fda50d68629dba66b0a5751eef930b93669a90faabf3e0a79bc3af3fa7c78
 EBUILD grass-6.4.0_rc5.ebuild 7571 RMD160 969b57c999f0054ddbe470889afab909135f0d38 SHA1 8719f2b829e4ec97e87f16dae69c6aa7a92378ac SHA256 3152882344086470164009b7d2dce0af4df40350732f5990a885b5ecd9a02db1
-EBUILD grass-6.4.0_rc6.ebuild 7843 RMD160 80646f26a01edd83228f11bd72c283f907a452af SHA1 888ecb472f09b16cced84d299e1b98b7cbf11fca SHA256 80cf3a2875553d484177030738776443ac2e73dbdcbd1ab4e9cae653e493987a
-MISC ChangeLog 17424 RMD160 235c9e117d8eab00e4c8b6fd8fae0ba70f036c34 SHA1 e6cecf967779e32efbfd7038d80ecc46fea87365 SHA256 f7c32ef89b80b06ca78b38d9efde1d284f35c16e9c7acc5fae0e4a6f5997bbeb
+EBUILD grass-6.4.0_rc6.ebuild 7869 RMD160 274801344934cdb4ba4108a841737dd37d14deea SHA1 7762d357dc3ad003c76db223c53e8a7e48290fd2 SHA256 4bd9962a945ba527a3928a62bf80169cfe65ea19ea18abddd78a803f694daccc
+MISC ChangeLog 17567 RMD160 b6cb22d00e78f51057e2d16a0c5a8eb7049d857e SHA1 f72c0681739fce10f60d8890ff1016209237dbfd SHA256 52123d1e0be704b4b5e8cbcaf429dfaa91f5bfbde3a7f673cf49920785187bd2
 MISC metadata.xml 689 RMD160 e86713ba2244d319bd1d76241c6e23d9bbb1ed35 SHA1 e6ef423536dc2e57b8f699fe24fe6af865f747df SHA256 e47a71f5bbefcdbce341e5445a88d1f7954762370a7f15628c56e7a31243f70e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwZzpIACgkQHB6c3gNBRYfgYACfZW9N06LcTOwbDltRvPZw0fgx
-TlgAn2L77U0G60qNhsSyPbcRVQ8NNG2q
-=61Fx
------END PGP SIGNATURE-----

diff --git a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
index 5d89ebd885860586d1b8bc607f47b50f9d717d46..62d4636a56914a45cdf8698c88fcc22d9bf84d76 100644 (file)
--- a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.7 2010/06/15 12:20:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.8 2010/06/17 14:22:58 arfrever Exp $
 
 EAPI="3"
 
@@ -121,8 +121,10 @@ pkg_setup() {
        use wxwidgets && ! use X && ewarn "For wxwidgets support X useflag must be enabled"
        use wxwidgets && ! use python && ewarn "For wxwidgets support python useflag must be enabled"
 
-       # only py2 is supported
-       python_set_active_version 2
+       if use python; then
+               # only py2 is supported
+               python_set_active_version 2
+       fi
 }
 
 src_prepare() {