Use Python 2 (bug #324171).

(Portage version: 2.2.0_alpha30_p2/cvs/Linux x86_64)

3 files changed, 29 insertions, 13 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 87b50f39e78f..ef274ec7d53e 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.307 2011/03/23 09:40:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.308 2011/04/25 21:17:50 arfrever Exp $
+
+  25 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gnome-games-2.28.2.ebuild, gnome-games-2.30.2-r1.ebuild:
+  Use Python 2 (bug #324171).
 
   23 Mar 2011; Pacho Ramos <pacho@gentoo.org> gnome-games-2.30.2-r1.ebuild:
   2.30.x versions are not ready to go to stable due clutter requirements.
diff --git a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
index 63e44494f64c..3deb4013a463 100644
--- a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild,v 1.9 2011/03/23 08:11:00 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild,v 1.10 2011/04/25 21:17:50 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 WANT_AUTOMAKE="1.11"
+PYTHON_DEPEND="2"
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -71,6 +72,9 @@ _omitgame() {
 }
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	# create the games user / group
 	games_pkg_setup
 
@@ -170,15 +174,17 @@ pkg_postinst() {
 	games-ggz_update_modules
 	gnome2_pkg_postinst
 	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/gnome_sudoku
+	python_mod_optimize gnome_sudoku
 	if use opengl; then
-		python_mod_optimize $(python_get_sitedir)/glchess
+		python_mod_optimize glchess
 	fi
 }
 
 pkg_postrm() {
 	games-ggz_update_modules
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{gnome_sudoku,glchess}
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/glchess
+	python_mod_cleanup gnome_sudoku
+	if use opengl; then
+		python_mod_cleanup glchess
+	fi
 }
diff --git a/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild b/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
index 5edb4ad8a459..c108468c8c26 100644
--- a/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild,v 1.13 2011/03/23 09:40:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild,v 1.14 2011/04/25 21:17:50 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 WANT_AUTOMAKE="1.11"
+PYTHON_DEPEND="2"
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -79,6 +80,9 @@ _omitgame() {
 }
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	# create the games user / group
 	games_pkg_setup
 
@@ -155,15 +159,17 @@ pkg_postinst() {
 	games-ggz_update_modules
 	gnome2_pkg_postinst
 	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/gnome_sudoku
+	python_mod_optimize gnome_sudoku
 	if use opengl; then
-		python_mod_optimize $(python_get_sitedir)/glchess
+		python_mod_optimize glchess
 	fi
 }
 
 pkg_postrm() {
 	games-ggz_update_modules
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{gnome_sudoku,glchess}
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/glchess
+	python_mod_cleanup gnome_sudoku
+	if use opengl; then
+		python_mod_cleanup glchess
+	fi
 }