Force python 2. Bug #312283

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

diff --git a/games-sports/ski/ChangeLog b/games-sports/ski/ChangeLog
index 2130db34dfdda7690264f9fd74f62cb2b2c3ac2b..4f7a4d4acb6b29deab7f37279d7a02ecf728f550 100644 (file)
--- a/games-sports/ski/ChangeLog
+++ b/games-sports/ski/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-sports/ski
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ChangeLog,v 1.8 2006/05/30 01:49:46 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ChangeLog,v 1.9 2010/04/07 13:24:49 tupone Exp $
+
+  07 Apr 2010; Alfredo Tupone <tupone@gentoo.org> ski-6.5.ebuild:
+  Force python 2. Bug #312283 by arfrever@gentoo.org
 
   30 May 2006; Joseph Jezak <josejx@gentoo.org> ski-6.5.ebuild:
   Marked ppc stable.

diff --git a/games-sports/ski/Manifest b/games-sports/ski/Manifest
index cd08c560d22e751f7bd08866b94f83f392aff449..77df2ec294b1caba2bde8f9b59d4fc3d76d5433e 100644 (file)
--- a/games-sports/ski/Manifest
+++ b/games-sports/ski/Manifest
@@ -1,4 +1,4 @@
 DIST ski-6.5.tar.gz 17389 RMD160 9a48559183d15484442c30ed379daeab0b1c7c16 SHA1 d6cc1a86b841884c5b19dffbed1f472970c7468c SHA256 346be95447df7eddc3888b5378dbed4bc9cd9136b14839b89c771ca425b7f1ed
-EBUILD ski-6.5.ebuild 583 RMD160 113388f244b9dd042bd8eecf815b1f9fba48554d SHA1 bb216a03980890163222d4913e3f999bc1937c26 SHA256 b0fef7d96393b3ec996c73de588da8257859fa82bba44a4d73d35fc2922b8e68
-MISC ChangeLog 903 RMD160 d6d1483237243e09c50c4024d652849f5b088174 SHA1 316d90b58ea55c6cee97decd71878d6fc31e35ca SHA256 a42def4188ef3e94945ccea4f62aa86b6b26ddd4c330bcefc8a869f5513e0bcb
+EBUILD ski-6.5.ebuild 726 RMD160 f97aadc2c496441e625704995194f2a2412f0abc SHA1 68df4c039f222766fbcc7cf0700992d60717ab95 SHA256 c7b521ee989cae995b496a47ef7e66c6119fc47ac6867cc3cef2fa92f705f842
+MISC ChangeLog 1023 RMD160 c0dac40be5d4351342bdfc6a6880b63e34b81ec2 SHA1 77bd0e7692889131c37940e2529a0ab4fab0b945 SHA256 a3a7b905969eca43e6d17d9a33cc6adf352097cc06e21019bd1ba60083585ccb
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-sports/ski/ski-6.5.ebuild b/games-sports/ski/ski-6.5.ebuild
index b2ec9bb0011ffb952a8b5e99d26cbd156a316509..d66268e4a484cc8910c22b62086f70a5800c0288 100644 (file)
--- a/games-sports/ski/ski-6.5.ebuild
+++ b/games-sports/ski/ski-6.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.5.ebuild,v 1.9 2006/05/30 01:49:46 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.5.ebuild,v 1.10 2010/04/07 13:24:49 tupone Exp $
+EAPI=2
+PYTHON_DEPEND="2"
 
-inherit games
+inherit python games
 
 DESCRIPTION="A simple text-mode skiing game"
 HOMEPAGE="http://www.catb.org/~esr/ski/"
@@ -13,7 +15,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/python"
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+       python_convert_shebangs -r 2 .
+}
 
 src_install() {
        dogamesbin ski || die "dogamesbin failed"
@@ -21,3 +28,8 @@ src_install() {
        dodoc README
        prepgamesdirs
 }
+
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}