Force python2 fixing bug #312227

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

diff --git a/games-action/accelerator3d/ChangeLog b/games-action/accelerator3d/ChangeLog
index e4e4efc2d7139ef19b06fc6ee5b101a84af10e89..535dee60f3697adb6b693f758f4af16e6db0b6da 100644 (file)
--- a/games-action/accelerator3d/ChangeLog
+++ b/games-action/accelerator3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/accelerator3d
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v 1.7 2010/04/09 19:14:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v 1.8 2010/05/04 06:20:09 tupone Exp $
+
+  04 May 2010; Tupone Alfredo <tupone@gentoo.org>
+  accelerator3d-0.1.1-r1.ebuild:
+  Force python2 fixing bug #312227 by arferever@gentoo.org
 
   09 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   accelerator3d-0.1.1-r1.ebuild:

diff --git a/games-action/accelerator3d/Manifest b/games-action/accelerator3d/Manifest
index 52066474fdf0fb2e5dc034e2700213867e996899..a168678d97409badecb00467d4ba894b361613ab 100644 (file)
--- a/games-action/accelerator3d/Manifest
+++ b/games-action/accelerator3d/Manifest
@@ -1,6 +1,6 @@
 AUX accelerator3d-0.1.1-gentoo-paths.patch 3073 RMD160 92abdf0ed7b2011eba78ed4c92aa4f20775c5fa1 SHA1 8a84333475e5d2adc2d562365b406df7d8608d60 SHA256 ab2e24e8d482747715fd085d14d2b533d75876c7a819442b66a21b41bfd62d6c
 AUX accelerator3d-0.1.1-gllightmodel.patch 570 RMD160 ce60de2e3e6bbb6c07401fe67377d76f287849c8 SHA1 ecc8ba471e8c7b3354566786b11f0c50bed7f53a SHA256 b59af2678c2fab2c246cca2b03171fbf460a2d4a9864fe04a6a2075c3f27820a
 DIST accelerator-0.1.1.tar.bz2 1183838 RMD160 f04b6ecfc8cf3b7e34f6c1df57bb038b78d3b001 SHA1 55fd3bb122c007ca3b3ce9e176c56e6021fcb63b SHA256 02fac1b6fc9bb5708f53ef7bcf123f5a4a04261e2764f984d3e3c64e06a74712
-EBUILD accelerator3d-0.1.1-r1.ebuild 1055 RMD160 2fa32f558387eafa02f052ddee9bf71e8199e9b9 SHA1 8758f43eea823a7fdf7ccbb7e59a8d4d7da66e65 SHA256 a1e68214a7039ee8545c183702291f09c0ff397be91ee9fb14d3fae8aef8a285
-MISC ChangeLog 1266 RMD160 57562446770d7dfc85a647c347f914d37995eb04 SHA1 6349af4e4bae260232f8a0173d29e50527b08ca2 SHA256 6362352afa5bb708d515abe9ab640b3214b37bbdcc4d7184633b44e1995a6b1c
+EBUILD accelerator3d-0.1.1-r1.ebuild 1165 RMD160 15c55465e565b385453c0fa5e1d2893a155127ba SHA1 512d2ea32af50085c56fb422c54e6d513ff3a856 SHA256 82b79047c8462e01bcdd92946511593a6f4b7e88d6665c26e239d1ae1145da95
+MISC ChangeLog 1405 RMD160 7795293dcba6021812b58f4f6b6ec7c7deb4afb1 SHA1 de976a4a03346283a51126ee916188b093e157ef SHA256 3a056bb4adf5424be16c0655718213364d11ad4ada4f337b224ed3f39356f297
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r1.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r1.ebuild
index ff15abeb7bd9afcadb6df69fd8e8f71070dc4691..6e03d65ad529f4e06c4d231ac40af19bd3997e25 100644 (file)
--- a/games-action/accelerator3d/accelerator3d-0.1.1-r1.ebuild
+++ b/games-action/accelerator3d/accelerator3d-0.1.1-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r1.ebuild,v 1.2 2010/04/09 19:14:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r1.ebuild,v 1.3 2010/05/04 06:20:09 tupone Exp $
 
 EAPI=2
-inherit eutils games
+PYTHON_DEPEND="2"
+inherit eutils python games
 
 DESCRIPTION="Fast-paced, 3D, first-person shoot/dodge-'em-up, in the vain of Tempest or n2o"
 HOMEPAGE="http://accelerator3d.sourceforge.net/"
@@ -16,11 +17,15 @@ IUSE=""
 
 DEPEND="dev-python/pyode
        dev-python/pygame
-       dev-python/pyopengl
-       virtual/python"
+       dev-python/pyopengl"
 
 S=${WORKDIR}/${PN}
 
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}
+
 src_prepare() {
        epatch \
                "${FILESDIR}"/${P}-gentoo-paths.patch \
@@ -28,6 +33,7 @@ src_prepare() {
        sed -i \
                -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
                accelerator.py || die
+       python_convert_shebangs 2 accelerator.py
 }
 
 src_install() {