Force python version to 2 . Bug #312285

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/games-strategy/lightyears/ChangeLog b/games-strategy/lightyears/ChangeLog
index 7af0ef3152d9c1af6e9e04f98b31ecfb76c1d026..b532b5e3f01f04da17680faac8ea9077106012ad 100644 (file)
--- a/games-strategy/lightyears/ChangeLog
+++ b/games-strategy/lightyears/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/lightyears
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/ChangeLog,v 1.10 2009/11/21 19:32:20 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/ChangeLog,v 1.11 2010/04/06 14:41:38 tupone Exp $
+
+  06 Apr 2010; Tupone Alfredo <tupone@gentoo.org> lightyears-1.3a.ebuild:
+  Force python version to 2 . Bug #312285 by arfrever@gentoo.org
 
   21 Nov 2009; Markus Meier <maekke@gentoo.org> lightyears-1.3a.ebuild:
   x86 stable, bug #289136

diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
index d2ebeb2ddbe988e2e0a8e05afa2abbf42f6c4678..cad9ed5ddf225d36facd0058fba1c9e9c5efa84c 100644 (file)
--- a/games-strategy/lightyears/Manifest
+++ b/games-strategy/lightyears/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lightyears-1.3a-gentoo.patch 968 RMD160 fd5792d117ecfeced59ee9d19a1e2d71396010d5 SHA1 481ec09e1a1ff858e90f9c745c94da39bf9dae0c SHA256 7ea3224c82a4ad1b877e91c896d976f29968f823f2dfd140107de84c746a985c
 DIST lightyears-1.3a.tar.gz 680843 RMD160 0a5dd05fe29002fe0a5d913cf6052611d54c32f7 SHA1 9ba3c48ce36d39c0d2bb44c7919f6fd301944ec2 SHA256 dd898452ce791321039bf895b50a77dab360c3866c98e3a80955fce71e637be0
-EBUILD lightyears-1.3a.ebuild 1231 RMD160 3993942fba9055b8872be816a72a201da7a01e93 SHA1 66bf035aac47fdbb45e6ffa03c14dde6235cd3e7 SHA256 ac1b7c546e4da5a515247f5135ae728c4aa1e5e13b600d9716ff6407ae676dc0
-MISC ChangeLog 1501 RMD160 9bb31d46c9cc03319d26b36fa015c72f127ff8ba SHA1 7e296e57e0abf16b3db0cee462a3463b9f63f30d SHA256 78a2dd3529649a8c86dcf3118f682142421a74a86c3a896875827c7954585177
+EBUILD lightyears-1.3a.ebuild 1327 RMD160 f436598d8cd78cd141199032fdd4134113520e52 SHA1 4cb9f1136f2cd609d578517a1f759e9b18b92191 SHA256 ff93a45af0b87d7900da4313e5cd6f9c3e52859cfa79261ec0c9f354303ef294
+MISC ChangeLog 1641 RMD160 8f33ed8e4094b86930c55fd2a4fd1c5fd9984c07 SHA1 cb853b020fe53fc3d24edf49c0e4f712be6f5cb9 SHA256 287dc7d241a17b63eecfa4b1464b941f8afc4c1d0ed66f0efe73416dcf8e3c91
 MISC metadata.xml 366 RMD160 5d947375304d60e93c580163a09d6c27dea33a98 SHA1 a4b1a9849dfc45aaca4fb7cac65e695cf4277cd7 SHA256 c21e8e6d236aef6628b448f839689a39ea28201b15ff08fffb1aadd717f7f6b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksIQFQACgkQkKaRLQcq0GKatgCeIg9vihmy0+XDJYMfzqak+M+3
-cNEAnjA1+MKXDBcSlUCBtkQnO/ZJXnft
-=hcWJ
------END PGP SIGNATURE-----

diff --git a/games-strategy/lightyears/lightyears-1.3a.ebuild b/games-strategy/lightyears/lightyears-1.3a.ebuild
index 61f2068fed7ab7230f182a9d89ddffd8a4ce1f2d..c2d57b4fffe2640ce16d7b8b78056eb10baab21c 100644 (file)
--- a/games-strategy/lightyears/lightyears-1.3a.ebuild
+++ b/games-strategy/lightyears/lightyears-1.3a.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.3a.ebuild,v 1.4 2009/11/21 19:32:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.3a.ebuild,v 1.5 2010/04/06 14:41:38 tupone Exp $
 
 EAPI=2
+PYTHON_DEPEND="2"
 inherit eutils python games
 
 DESCRIPTION="a single-player game with a science-fiction theme"
@@ -14,8 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-       dev-python/pygame"
+DEPEND="dev-python/pygame"
 
 src_prepare() {
        epatch "${FILESDIR}/${P}"-gentoo.patch
@@ -23,6 +23,7 @@ src_prepare() {
                -e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \
                -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
                ${PN} || die "Changing library path failed"
+       python_convert_shebangs -r 2 .
 }
 
 src_install() {
@@ -41,6 +42,11 @@ src_install() {
        prepgamesdirs
 }
 
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}
+
 pkg_postinst() {
        python_mod_optimize "$(games_get_libdir)/${PN}"
        games_pkg_postinst