[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-games/

[Gilles Dartiguelongue]

commit:     605a5085912f1fad31a123d39449baf942a36dd7
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 21:33:51 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 21:33:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=605a5085

gnome-extra/gnome-games: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Drop unused USE=seed from metadata.xml.

---
 gnome-extra/gnome-games/gnome-games-3.6.1.ebuild |  156 ----------------------
 gnome-extra/gnome-games/gnome-games-9999.ebuild  |   73 ++++++++---
 gnome-extra/gnome-games/metadata.xml             |    2 -
 3 files changed, 54 insertions(+), 177 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.6.1.ebuild b/gnome-extra/gnome-games/gnome-games-3.6.1.ebuild
deleted file mode 100644
index 6813cef..0000000
--- a/gnome-extra/gnome-games/gnome-games-3.6.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-# Make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-inherit games gnome2 python virtualx
-
-DESCRIPTION="Collection of games for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/GnomeGames/"
-
-LICENSE="GPL-2 GPL-3 FDL-1.1"
-SLOT="0"
-# TODO: file KEYWORDREQ bug once it's determined that seed is usable
-KEYWORDS="~amd64 ~mips ~x86"
-
-# FIXME: we should decide whether to have USE flag for games of features
-# IUSE="artworkextra clutter opengl python test"
-# vs
-# IUSE="artworkextra aisleriot glchess quadrapassel swell-foop lightsoff gnibbles sudoku"
-IUSE="artworkextra +aisleriot +clutter +glchess +sudoku test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.25.7
-	>=gnome-base/librsvg-2.32
-	>=x11-libs/cairo-1.10
-	>=x11-libs/gtk+-3.3.11:3[introspection]
-
-	>=media-libs/libcanberra-0.26[gtk3]
-
-	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3 )
-	clutter? (
-		media-libs/clutter:1.0[introspection]
-		>=media-libs/clutter-gtk-0.91.6:1.0 )
-	glchess? (
-		dev-db/sqlite:3
-		virtual/glu
-		virtual/opengl
-		x11-libs/libX11 )
-	sudoku? ( dev-libs/gobject-introspection )
-"
-RDEPEND="${COMMON_DEPEND}
-	sudoku? (
-		dev-python/pycairo
-		dev-python/pygobject:3[cairo]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/pango[introspection]
-		>=x11-libs/gtk+-3.0.0:3[introspection] )
-
-	!<gnome-extra/gnome-games-extra-data-3
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40.4
-	dev-util/itstool
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig
-"
-
-# For compatibility with older versions of the gnome-games package
-PDEPEND="aisleriot? ( games-board/aisleriot )"
-
-# Others are installed below; multiples in this package.
-DOCS="AUTHORS HACKING MAINTAINERS TODO"
-
-_omitgame() {
-	G2CONF="${G2CONF},${1}"
-}
-
-pkg_setup() {
-	# create the games user / group
-	games_pkg_setup
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		ITSTOOL=$(type -P true)
-		VALAC=$(type -P true)
-		--with-platform=gnome
-		--with-scores-group=${GAMES_GROUP}
-		--enable-omitgames=none" # This line should be last for _omitgame
-
-	# FIXME: Use REQUIRED_USE once games.eclass is ported to EAPI 4
-	if ! use clutter; then
-		ewarn "USE='-clutter' => quadrapassel, swell-foop, lightsoff, gnibbles won't be installed"
-		_omitgame quadrapassel
-		_omitgame gnibbles
-		_omitgame swell-foop
-		_omitgame lightsoff
-	fi
-
-	if ! use glchess; then
-		_omitgame glchess
-	fi
-
-	if ! use sudoku; then
-		_omitgame gnome-sudoku
-	else
-		python_convert_shebangs -r 2 gnome-sudoku/src
-		python_clean_py-compile_files
-	fi
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Documentation install for each of the games
-	for game in \
-	$(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
-		docinto ${game}
-		for doc in AUTHORS ChangeLog NEWS README TODO; do
-			[ -s ${game}/${doc} ] && dodoc ${game}/${doc}
-		done
-	done
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	# Avoid overwriting previous .scores files
-	local basefile
-	for scorefile in "${ED}"/var/lib/games/*.scores; do
-		basefile=$(basename $scorefile)
-		if [ -s "${EROOT}/var/lib/games/${basefile}" ]; then
-			cp "${EROOT}/var/lib/games/${basefile}" \
-			"${ED}/var/lib/games/${basefile}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_pkg_postinst
-	python_need_rebuild
-	use sudoku && python_mod_optimize gnome_sudoku
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup gnome_sudoku
-}

diff --git a/gnome-extra/gnome-games/gnome-games-9999.ebuild b/gnome-extra/gnome-games/gnome-games-9999.ebuild
index 81d8d5b..b3a4e57 100644
--- a/gnome-extra/gnome-games/gnome-games-9999.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-9999.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
 
 # Make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
-inherit games gnome2 python virtualx
+inherit games gnome2 python-r1 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -24,8 +24,12 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~mips ~x86"
 fi
+# FIXME: we should decide whether to have USE flag for games or features
+# IUSE="artworkextra clutter opengl python test"
+# vs
+# IUSE="artworkextra aisleriot glchess quadrapassel swell-foop lightsoff gnibbles sudoku"
 IUSE="artworkextra +aisleriot +clutter +glchess +sudoku test"
 
 COMMON_DEPEND="
@@ -49,16 +53,16 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	sudoku? (
+		${PYTHON_DEPS}
 		dev-python/pycairo
-		dev-python/pygobject:3[cairo]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		x11-libs/gdk-pixbuf:2[introspection]
 		x11-libs/pango[introspection]
-		>=x11-libs/gtk+-3.0.0:3[introspection] )
+		>=x11-libs/gtk+-3:3[introspection] )
 
 	!<gnome-extra/gnome-games-extra-data-3
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
 	>=dev-util/intltool-0.40.4
 	dev-util/itstool
 	>=sys-devel/gettext-0.10.40
@@ -67,6 +71,7 @@ DEPEND="${COMMON_DEPEND}
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${COMMON_DEPEND}
+		app-text/yelp-tools
 		>=dev-lang/vala-0.15.1:0.16"
 fi
 
@@ -83,15 +88,19 @@ _omitgame() {
 pkg_setup() {
 	# create the games user / group
 	games_pkg_setup
-
-	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
+	gnome2_src_prepare
+	if use sudoku ; then
+		python_copy_sources
+	fi
+}
+
+src_configure() {
 	G2CONF="${G2CONF}
 		--disable-static
-		ITSTOOL=$(type -P true)
 		VALAC=$(type -P true)
 		--with-platform=gnome
 		--with-scores-group=${GAMES_GROUP}
@@ -112,20 +121,43 @@ src_prepare() {
 
 	if ! use sudoku; then
 		_omitgame gnome-sudoku
+	fi
+
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+
+	if use sudoku ; then
+		python_foreach_impl run_in_build_dir gnome2_src_configure
 	else
-		python_convert_shebangs -r 2 gnome-sudoku/src
-		python_clean_py-compile_files
+		gnome2_src_configure
 	fi
+}
 
-	gnome2_src_prepare
+src_compile() {
+	if use sudoku ; then
+		python_foreach_impl run_in_build_dir gnome2_src_compile
+	else
+		gnome2_src_compile
+	fi
 }
 
 src_test() {
-	Xemake check || die "tests failed"
+	if use sudoku ; then
+		python_foreach_impl run_in_build_dir Xemake check
+	else
+		Xemake check || die "tests failed"
+	fi
 }
 
 src_install() {
-	gnome2_src_install
+	if use sudoku ; then
+		install_python() {
+				gnome2_src_install
+				python_doscript gnome-sudoku/src/gnome-sudoku
+		}
+		python_foreach_impl run_in_build_dir install_python
+	else
+		gnome2_src_install
+	fi
 
 	# Documentation install for each of the games
 	for game in \
@@ -153,11 +185,14 @@ pkg_preinst() {
 pkg_postinst() {
 	games_pkg_postinst
 	gnome2_pkg_postinst
-	python_need_rebuild
-	use sudoku && python_mod_optimize gnome_sudoku
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup gnome_sudoku
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
 }

diff --git a/gnome-extra/gnome-games/metadata.xml b/gnome-extra/gnome-games/metadata.xml
index ac06171..149899a 100644
--- a/gnome-extra/gnome-games/metadata.xml
+++ b/gnome-extra/gnome-games/metadata.xml
@@ -8,8 +8,6 @@
     <flag name="clutter">Install games that use <pkg>media-libs/clutter</pkg></flag>
     <flag name="glchess">Install Chess written in <pkg>dev-lang/vala</pkg> and
 		OpenGL</flag>
-    <flag name="seed">Install swell-foop and lightsoff which are written in 
-		JavaScript using <pkg>dev-libs/seed</pkg></flag>
     <flag name="sudoku">Install the game Sudoku which uses
 		<pkg>dev-python/pygobject</pkg> and introspection</flag>
   </use>