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

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

[Nirbheek Chauhan]

commit:     5e8d794f7c6cc0cca7050b39d6f2609ef7cce24e
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 01:37:21 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 01:52:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5e8d794f

gnome-extra/gnome-games: 2.91.91 → 2.91.93

* Experimental aisleriot-clutter removed
* Various updates

---
 ...s-2.91.91.ebuild => gnome-games-2.91.93.ebuild} |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-2.91.91.ebuild b/gnome-extra/gnome-games/gnome-games-2.91.93.ebuild
similarity index 96%
rename from gnome-extra/gnome-games/gnome-games-2.91.91.ebuild
rename to gnome-extra/gnome-games/gnome-games-2.91.93.ebuild
index a4a7b2e..5b9e9c9 100644
--- a/gnome-extra/gnome-games/gnome-games-2.91.91.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.91.93.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://live.gnome.org/GnomeGames/"
 LICENSE="GPL-2 GPL-3 FDL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+aisleriot artworkextra +clutter +introspection glchess seed +sudoku test"
+IUSE="+aisleriot +clutter +introspection glchess seed +sudoku test"
 
 COMMON_DEPEND="
 	>=dev-games/libggz-0.0.14
@@ -34,7 +34,6 @@ COMMON_DEPEND="
 	x11-libs/libSM
 
 	aisleriot? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
-	artworkextra? ( gnome-extra/gnome-games-extra-data )
 	clutter? (
 		>=dev-libs/gobject-introspection-0.6.3
 		>=x11-libs/gtk+-2.90:3[introspection]
@@ -49,7 +48,10 @@ COMMON_DEPEND="
 		>=dev-lang/vala-0.11.6:0.12
 		>=gnome-base/librsvg-2.32
 		virtual/opengl
-		x11-libs/libX11 )"
+		x11-libs/libX11 )
+	
+	!gnome-extra/gnome-games-extra-data"
+# FIXME: /usr/share/gnome-games-common/cards/bonded.svg collides!
 RDEPEND="${COMMON_DEPEND}
 	sudoku? (
 		>=dev-python/gconf-python-2.17.3

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

[Nirbheek Chauhan]

commit:     fbffead5d3e75fde2a798e567d5d9d03d69e5527
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 19:26:36 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 21:20:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fbffead5

gnome-extra/gnome-games: 2.91.93 → 3.0.0

---
 ...mes-2.91.93.ebuild => gnome-games-3.0.0.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-2.91.93.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
similarity index 100%
rename from gnome-extra/gnome-games/gnome-games-2.91.93.ebuild
rename to gnome-extra/gnome-games/gnome-games-3.0.0.ebuild

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

[Nirbheek Chauhan]

commit:     a61106a354c119d95bd6ea6a290260ef28e15b65
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 09:58:31 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 09:58:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a61106a3

gnome-extra/gnome-games: fix USE=sudoku

* Reported by SardemFF7

---
 gnome-extra/gnome-games/gnome-games-3.0.0.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
index 28cd5ee..54988cf 100644
--- a/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
@@ -124,7 +124,7 @@ pkg_setup() {
 	fi
 
 	if ! use sudoku; then
-		_omitgame sudoku
+		_omitgame gnome-sudoku
 	fi
 }
 

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

[Nirbheek Chauhan]

commit:     8cb80741611b97da026e0374176be0c4c1dfc2fb
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 10:26:44 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 10:26:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8cb80741

gnome-extra/gnome-games: misc QA fixes

---
 gnome-extra/gnome-games/gnome-games-3.0.0.ebuild |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
index 54988cf..5bb0a85 100644
--- a/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
@@ -179,12 +179,11 @@ pkg_postinst() {
 	games-ggz_update_modules
 	gnome2_pkg_postinst
 	python_need_rebuild
-	python_mod_optimize gnome_sudoku
-	use opengl && python_mod_optimize glchess
+	use sudoku && python_mod_optimize gnome_sudoku
 }
 
 pkg_postrm() {
 	games-ggz_update_modules
 	gnome2_pkg_postrm
-	python_mod_cleanup gnome_sudoku glchess
+	python_mod_cleanup gnome_sudoku
 }

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

[Nirbheek Chauhan]

commit:     3022bb1bbdb757d0296390759232d0f5e85e5c93
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 08:46:53 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 08:49:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3022bb1b

gnome-extra/gnome-games: 3.0.0 → 3.0.1

---
 ...games-3.0.0.ebuild => gnome-games-3.0.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.0.0.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.1.ebuild
similarity index 100%
rename from gnome-extra/gnome-games/gnome-games-3.0.0.ebuild
rename to gnome-extra/gnome-games/gnome-games-3.0.1.ebuild

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

[Nirbheek Chauhan]

commit:     c7dc777012f9dd1eb8a2d8a2fae5e3e2b5cc8ed8
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 14:39:47 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 14:39:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c7dc7770

gnome-extra/gnome-games: 3.0.1 → 3.0.1.1

---
 ...mes-3.0.1.ebuild => gnome-games-3.0.1.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.0.1.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.1.1.ebuild
similarity index 100%
rename from gnome-extra/gnome-games/gnome-games-3.0.1.ebuild
rename to gnome-extra/gnome-games/gnome-games-3.0.1.1.ebuild

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

[Nirbheek Chauhan]

commit:     d6b6b01e9cd0bf4613cb0fbcb02cbda2916d1fe4
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue May 24 04:32:40 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 15:48:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d6b6b01e

gnome-extra/gnome-games-3.0.2 version bump

* gnome-sudoku has been ported to gtk3, adjust deps accordingly
* convert gnome-sudoku's python shebang

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 ...mes-3.0.1.1.ebuild => gnome-games-3.0.2.ebuild} |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.0.1.1.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
similarity index 95%
rename from gnome-extra/gnome-games/gnome-games-3.0.1.1.ebuild
rename to gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
index 5bb0a85..ad6ab19 100644
--- a/gnome-extra/gnome-games/gnome-games-3.0.1.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
@@ -52,10 +52,12 @@ COMMON_DEPEND="
 		x11-libs/libX11 )"
 RDEPEND="${COMMON_DEPEND}
 	sudoku? (
-		>=dev-python/gconf-python-2.17.3
+		dev-libs/glib:2[introspection]
+		>=dev-python/pycairo-1
 		>=dev-python/pygobject-2
-		>=dev-python/pygtk-2.14
-		>=dev-python/pycairo-1 )
+		>=x11-libs/gtk+-3.0.0:3[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/pango[introspection] )
 
 	!<gnome-extra/gnome-games-extra-data-3.0.0"
 DEPEND="${COMMON_DEPEND}
@@ -131,6 +133,8 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	use sudoku && python_convert_shebangs 2 gnome-sudoku/src/gnome-sudoku.in.in
+
 	# TODO: File upstream bug for this
 	epatch "${FILESDIR}/${PN}-2.91.90-fix-conditional-ac-prog-cxx.patch"
 

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

[Alexandre Restovtsev]

commit:     3055f8276675e6a01ca07859681d23d44d1beaf6
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 02:00:14 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Oct 28 02:00:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3055f827

gnome-extra/gnome-games: 3.2.0 → 3.2.1

Translation updates only.

---
 ...games-3.2.0.ebuild => gnome-games-3.2.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.2.0.ebuild b/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild
similarity index 100%
rename from gnome-extra/gnome-games/gnome-games-3.2.0.ebuild
rename to gnome-extra/gnome-games/gnome-games-3.2.1.ebuild

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

[Nirbheek Chauhan]

commit:     022f804e4b43b5c1679de6713ebdcca10690c60b
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 08:18:07 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=022f804e

Add gnome-extra/gnome-games-3.3.92

---
 gnome-extra/gnome-games/gnome-games-3.3.92.ebuild |  173 +++++++++++++++++++++
 1 files changed, 173 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.3.92.ebuild b/gnome-extra/gnome-games/gnome-games-3.3.92.ebuild
new file mode 100644
index 0000000..3fec122
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-3.3.92.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-3.2.1-r1.ebuild,v 1.3 2012/02/10 03:33:26 patrick Exp $
+
+EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+WANT_AUTOMAKE="1.11"
+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 autotools games eutils 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 ~x86"
+IUSE="artworkextra +aisleriot +clutter +glchess +introspection +sudoku test"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.75
+	>=dev-libs/glib-2.25.7
+	>=dev-libs/libxml2-2.4.0
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/cairo-1.10.0
+	>=x11-libs/gtk+-3.3.11:3[introspection?]
+
+	>=media-libs/libcanberra-0.26[gtk3]
+	x11-libs/libSM
+
+	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
+	clutter? (
+		>=dev-libs/gobject-introspection-0.6.3
+		x11-libs/gtk+:3[introspection]
+		>=media-libs/clutter-gtk-0.91.6:1.0[introspection] )
+	introspection? (
+		>=dev-libs/gobject-introspection-0.6.3
+		media-libs/clutter:1.0[introspection] )
+	glchess? (
+		dev-db/sqlite:3
+		>=gnome-base/librsvg-2.32
+		virtual/opengl
+		x11-libs/libX11 )"
+RDEPEND="${COMMON_DEPEND}
+	sudoku? (
+		|| (
+			dev-python/pygobject:3[cairo]
+			>=dev-python/pygobject-2.28.3:2[cairo,introspection] )
+		dev-python/pycairo
+		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.0.0"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/vala-0.15.1:0.16
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=dev-util/pkgconfig-0.15
+	>=dev-util/intltool-0.40.4
+	>=sys-devel/gettext-0.10.40
+	>=gnome-base/gnome-common-2.12.0
+	test? ( >=dev-libs/check-0.9.4 )"
+
+# 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
+
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--disable-static
+		$(use_enable introspection)
+		VALAC=$(type -p valac-0.16)"
+
+	# Should be after $(use_enable introspection), but before --enable-omitgames
+	#use clutter && G2CONF="${G2CONF} --enable-introspection"
+
+	G2CONF="${G2CONF}
+		--with-scores-group=${GAMES_GROUP}
+		--with-platform=gnome
+		--with-smclient
+		--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
+	fi
+}
+
+src_prepare() {
+	use sudoku && python_convert_shebangs -r 2 gnome-sudoku/src
+
+	# Without this, --enable-staging enables all those games unconditionally
+	#epatch "${FILESDIR}/${PN}-fix-staging-games.patch"
+
+	# disable pyc compiling
+	echo > py-compile
+
+	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
+}

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

[Alexandre Restovtsev]

commit:     16d10891eb8cf9dcd07a54922c3860e9a162ce0c
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  8 16:12:06 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Apr  8 16:20:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=16d10891

gnome-extra/gnome-games: 3.3.92 → 3.4.0

The smclient code was removed in gnome-games-3.3.4.

---
 ...ames-3.3.92.ebuild => gnome-games-3.4.0.ebuild} |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.3.92.ebuild b/gnome-extra/gnome-games/gnome-games-3.4.0.ebuild
similarity index 99%
rename from gnome-extra/gnome-games/gnome-games-3.3.92.ebuild
rename to gnome-extra/gnome-games/gnome-games-3.4.0.ebuild
index 3fec122..1b636e0 100644
--- a/gnome-extra/gnome-games/gnome-games-3.3.92.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-3.4.0.ebuild
@@ -32,7 +32,6 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.3.11:3[introspection?]
 
 	>=media-libs/libcanberra-0.26[gtk3]
-	x11-libs/libSM
 
 	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
 	clutter? (
@@ -97,7 +96,6 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--with-scores-group=${GAMES_GROUP}
 		--with-platform=gnome
-		--with-smclient
 		--enable-omitgames=none" # This line should be last for _omitgame
 
 	# FIXME: Use REQUIRED_USE once games.eclass is ported to EAPI 4

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

[Alexandre Restovtsev]

commit:     0bbd5345a25b6228cc72654476dc2201f917c715
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 09:08:03 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 09:08:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0bbd5345

gnome-extra/gnome-games: moved to gx86; add live ebuild

---
 ...-games-3.4.0.ebuild => gnome-games-9999.ebuild} |   47 +++++++++----------
 1 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-3.4.0.ebuild b/gnome-extra/gnome-games/gnome-games-9999.ebuild
similarity index 77%
rename from gnome-extra/gnome-games/gnome-games-3.4.0.ebuild
rename to gnome-extra/gnome-games/gnome-games-9999.ebuild
index 8063193..811328e 100644
--- a/gnome-extra/gnome-games/gnome-games-3.4.0.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-3.2.1-r1.ebuild,v 1.3 2012/02/10 03:33:26 patrick Exp $
+# $Header: $
 
 EAPI="3"
 GNOME_TARBALL_SUFFIX="xz"
@@ -12,7 +12,10 @@ PYTHON_USE_WITH="xml"
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
-inherit autotools games eutils gnome2 python virtualx
+inherit games gnome2 python virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/GnomeGames/"
@@ -20,7 +23,11 @@ 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 ~x86"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE="artworkextra +aisleriot +clutter +glchess +introspection +sudoku test"
 
 COMMON_DEPEND="
@@ -28,43 +35,39 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.25.7
 	>=dev-libs/libxml2-2.4.0
 	>=gnome-base/librsvg-2.32
-	>=x11-libs/cairo-1.10.0
+	>=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.0.0 )
 	clutter? (
-		>=dev-libs/gobject-introspection-0.6.3
-		x11-libs/gtk+:3[introspection]
-		>=media-libs/clutter-gtk-0.91.6:1.0[introspection] )
+		media-libs/clutter:1.0
+		>=media-libs/clutter-gtk-0.91.6:1.0 )
 	introspection? (
-		>=dev-libs/gobject-introspection-0.6.3
+		>=dev-libs/gobject-introspection-0.9.10
 		media-libs/clutter:1.0[introspection] )
 	glchess? (
 		dev-db/sqlite:3
-		>=gnome-base/librsvg-2.32
 		virtual/opengl
 		x11-libs/libX11 )"
 RDEPEND="${COMMON_DEPEND}
 	sudoku? (
-		|| (
-			dev-python/pygobject:3[cairo]
-			>=dev-python/pygobject-2.28.3:2[cairo,introspection] )
 		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.0.0"
 DEPEND="${COMMON_DEPEND}
+	>=app-text/gnome-doc-utils-0.10
 	>=dev-lang/vala-0.15.1:0.16
 	dev-libs/libxml2:2
-	dev-util/itstool
 	>=dev-util/intltool-0.40.4
+	dev-util/itstool
 	>=sys-devel/gettext-0.10.40
 	virtual/pkgconfig
-	>=gnome-base/gnome-common-2.12.0
 	test? ( >=dev-libs/check-0.9.4 )"
 
 # For compatibility with older versions of the gnome-games package
@@ -88,10 +91,7 @@ pkg_setup() {
 		--disable-schemas-compile
 		--disable-static
 		$(use_enable introspection)
-		VALAC=$(type -p valac-0.16)"
-
-	# Should be after $(use_enable introspection), but before --enable-omitgames
-	#use clutter && G2CONF="${G2CONF} --enable-introspection"
+		VALAC=$(type -P valac-0.16)"
 
 	G2CONF="${G2CONF}
 		--with-scores-group=${GAMES_GROUP}
@@ -117,13 +117,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use sudoku && python_convert_shebangs -r 2 gnome-sudoku/src
-
-	# Without this, --enable-staging enables all those games unconditionally
-	#epatch "${FILESDIR}/${PN}-fix-staging-games.patch"
-
-	# disable pyc compiling
-	echo > py-compile
+	if use sudoku; then
+		python_convert_shebangs -r 2 gnome-sudoku/src
+		python_clean_py-compile_files
+	fi
 
 	gnome2_src_prepare
 }

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

[Gilles Dartiguelongue]

commit:     fa164f1986c03d0cf009000e079ef5885247f421
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 24 17:51:07 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Nov 24 17:51:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fa164f19

gnome-extra/gnome-games: 3.4.2 → 3.6.1

---
 ...-games-9999.ebuild => gnome-games-3.6.1.ebuild} |   64 ++++++++------------
 gnome-extra/gnome-games/gnome-games-9999.ebuild    |   55 ++++++++---------
 gnome-extra/gnome-games/metadata.xml               |   16 +++++
 3 files changed, 67 insertions(+), 68 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-9999.ebuild b/gnome-extra/gnome-games/gnome-games-3.6.1.ebuild
similarity index 76%
copy from gnome-extra/gnome-games/gnome-games-9999.ebuild
copy to gnome-extra/gnome-games/gnome-games-3.6.1.ebuild
index 811328e..6813cef 100644
--- a/gnome-extra/gnome-games/gnome-games-9999.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-3.6.1.ebuild
@@ -2,20 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-WANT_AUTOMAKE="1.11"
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="xml"
 
-# make sure games is inherited first so that the gnome2
+# Make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
 inherit games gnome2 python virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/GnomeGames/"
@@ -23,34 +18,33 @@ 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
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="artworkextra +aisleriot +clutter +glchess +introspection +sudoku test"
+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/dbus-glib-0.75
 	>=dev-libs/glib-2.25.7
-	>=dev-libs/libxml2-2.4.0
 	>=gnome-base/librsvg-2.32
 	>=x11-libs/cairo-1.10
-	>=x11-libs/gtk+-3.3.11:3[introspection?]
+	>=x11-libs/gtk+-3.3.11:3[introspection]
 
 	>=media-libs/libcanberra-0.26[gtk3]
 
-	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
+	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3 )
 	clutter? (
-		media-libs/clutter:1.0
+		media-libs/clutter:1.0[introspection]
 		>=media-libs/clutter-gtk-0.91.6:1.0 )
-	introspection? (
-		>=dev-libs/gobject-introspection-0.9.10
-		media-libs/clutter:1.0[introspection] )
 	glchess? (
 		dev-db/sqlite:3
+		virtual/glu
 		virtual/opengl
-		x11-libs/libX11 )"
+		x11-libs/libX11 )
+	sudoku? ( dev-libs/gobject-introspection )
+"
 RDEPEND="${COMMON_DEPEND}
 	sudoku? (
 		dev-python/pycairo
@@ -59,16 +53,15 @@ RDEPEND="${COMMON_DEPEND}
 		x11-libs/pango[introspection]
 		>=x11-libs/gtk+-3.0.0:3[introspection] )
 
-	!<gnome-extra/gnome-games-extra-data-3.0.0"
+	!<gnome-extra/gnome-games-extra-data-3
+"
 DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.10
-	>=dev-lang/vala-0.15.1:0.16
-	dev-libs/libxml2:2
+	app-text/yelp-tools
 	>=dev-util/intltool-0.40.4
 	dev-util/itstool
 	>=sys-devel/gettext-0.10.40
 	virtual/pkgconfig
-	test? ( >=dev-libs/check-0.9.4 )"
+"
 
 # For compatibility with older versions of the gnome-games package
 PDEPEND="aisleriot? ( games-board/aisleriot )"
@@ -86,16 +79,15 @@ pkg_setup() {
 
 	python_set_active_version 2
 	python_pkg_setup
+}
 
+src_prepare() {
 	G2CONF="${G2CONF}
-		--disable-schemas-compile
 		--disable-static
-		$(use_enable introspection)
-		VALAC=$(type -P valac-0.16)"
-
-	G2CONF="${G2CONF}
-		--with-scores-group=${GAMES_GROUP}
+		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
@@ -113,11 +105,7 @@ pkg_setup() {
 
 	if ! use sudoku; then
 		_omitgame gnome-sudoku
-	fi
-}
-
-src_prepare() {
-	if use sudoku; then
+	else
 		python_convert_shebangs -r 2 gnome-sudoku/src
 		python_clean_py-compile_files
 	fi

diff --git a/gnome-extra/gnome-games/gnome-games-9999.ebuild b/gnome-extra/gnome-games/gnome-games-9999.ebuild
index 811328e..81d8d5b 100644
--- a/gnome-extra/gnome-games/gnome-games-9999.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-9999.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-WANT_AUTOMAKE="1.11"
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="xml"
 
-# make sure games is inherited first so that the gnome2
+# Make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
 inherit games gnome2 python virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -28,29 +26,27 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="artworkextra +aisleriot +clutter +glchess +introspection +sudoku test"
+IUSE="artworkextra +aisleriot +clutter +glchess +sudoku test"
 
 COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.75
 	>=dev-libs/glib-2.25.7
-	>=dev-libs/libxml2-2.4.0
 	>=gnome-base/librsvg-2.32
 	>=x11-libs/cairo-1.10
-	>=x11-libs/gtk+-3.3.11:3[introspection?]
+	>=x11-libs/gtk+-3.3.11:3[introspection]
 
 	>=media-libs/libcanberra-0.26[gtk3]
 
-	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
+	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3 )
 	clutter? (
-		media-libs/clutter:1.0
+		media-libs/clutter:1.0[introspection]
 		>=media-libs/clutter-gtk-0.91.6:1.0 )
-	introspection? (
-		>=dev-libs/gobject-introspection-0.9.10
-		media-libs/clutter:1.0[introspection] )
 	glchess? (
 		dev-db/sqlite:3
+		virtual/glu
 		virtual/opengl
-		x11-libs/libX11 )"
+		x11-libs/libX11 )
+	sudoku? ( dev-libs/gobject-introspection )
+"
 RDEPEND="${COMMON_DEPEND}
 	sudoku? (
 		dev-python/pycairo
@@ -59,16 +55,20 @@ RDEPEND="${COMMON_DEPEND}
 		x11-libs/pango[introspection]
 		>=x11-libs/gtk+-3.0.0:3[introspection] )
 
-	!<gnome-extra/gnome-games-extra-data-3.0.0"
+	!<gnome-extra/gnome-games-extra-data-3
+"
 DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.10
-	>=dev-lang/vala-0.15.1:0.16
-	dev-libs/libxml2:2
+	app-text/yelp-tools
 	>=dev-util/intltool-0.40.4
 	dev-util/itstool
 	>=sys-devel/gettext-0.10.40
 	virtual/pkgconfig
-	test? ( >=dev-libs/check-0.9.4 )"
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${COMMON_DEPEND}
+		>=dev-lang/vala-0.15.1:0.16"
+fi
 
 # For compatibility with older versions of the gnome-games package
 PDEPEND="aisleriot? ( games-board/aisleriot )"
@@ -86,16 +86,15 @@ pkg_setup() {
 
 	python_set_active_version 2
 	python_pkg_setup
+}
 
+src_prepare() {
 	G2CONF="${G2CONF}
-		--disable-schemas-compile
 		--disable-static
-		$(use_enable introspection)
-		VALAC=$(type -P valac-0.16)"
-
-	G2CONF="${G2CONF}
-		--with-scores-group=${GAMES_GROUP}
+		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
@@ -113,11 +112,7 @@ pkg_setup() {
 
 	if ! use sudoku; then
 		_omitgame gnome-sudoku
-	fi
-}
-
-src_prepare() {
-	if use sudoku; then
+	else
 		python_convert_shebangs -r 2 gnome-sudoku/src
 		python_clean_py-compile_files
 	fi

diff --git a/gnome-extra/gnome-games/metadata.xml b/gnome-extra/gnome-games/metadata.xml
new file mode 100644
index 0000000..ac06171
--- /dev/null
+++ b/gnome-extra/gnome-games/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="aisleriot">Install the card game Aisleriot (Solitaire)</flag>
+    <flag name="artworkextra">Installs extra artwork for various games</flag>
+    <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>
+</pkgmetadata>

[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>

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

[Gilles Dartiguelongue]

commit:     01a29f1b367e5fffde58a9ca31b9eea72cde9390
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 20:56:28 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 20:58:04 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=01a29f1b

gnome-extra/gnome-games: package was split upstream, no code here anymore, removing

---
 gnome-extra/gnome-games/gnome-games-9999.ebuild | 198 ------------------------
 gnome-extra/gnome-games/metadata.xml            |  14 --
 2 files changed, 212 deletions(-)

diff --git a/gnome-extra/gnome-games/gnome-games-9999.ebuild b/gnome-extra/gnome-games/gnome-games-9999.ebuild
deleted file mode 100644
index b3a4e57..0000000
--- a/gnome-extra/gnome-games/gnome-games-9999.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-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-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-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
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	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="
-	>=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? (
-		${PYTHON_DEPS}
-		dev-python/pycairo
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/pango[introspection]
-		>=x11-libs/gtk+-3:3[introspection] )
-
-	!<gnome-extra/gnome-games-extra-data-3
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.4
-	dev-util/itstool
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig
-"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${COMMON_DEPEND}
-		app-text/yelp-tools
-		>=dev-lang/vala-0.15.1:0.16"
-fi
-
-# 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_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	if use sudoku ; then
-		python_copy_sources
-	fi
-}
-
-src_configure() {
-	G2CONF="${G2CONF}
-		--disable-static
-		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
-	fi
-
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
-	if use sudoku ; then
-		python_foreach_impl run_in_build_dir gnome2_src_configure
-	else
-		gnome2_src_configure
-	fi
-}
-
-src_compile() {
-	if use sudoku ; then
-		python_foreach_impl run_in_build_dir gnome2_src_compile
-	else
-		gnome2_src_compile
-	fi
-}
-
-src_test() {
-	if use sudoku ; then
-		python_foreach_impl run_in_build_dir Xemake check
-	else
-		Xemake check || die "tests failed"
-	fi
-}
-
-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 \
-	$(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
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
-
-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
deleted file mode 100644
index 149899a..0000000
--- a/gnome-extra/gnome-games/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="aisleriot">Install the card game Aisleriot (Solitaire)</flag>
-    <flag name="artworkextra">Installs extra artwork for various games</flag>
-    <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="sudoku">Install the game Sudoku which uses
-		<pkg>dev-python/pygobject</pkg> and introspection</flag>
-  </use>
-</pkgmetadata>