Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: aisleriot was split off into a separate package; ggz support is gone; games have been ported to gsettings and pygobject-3.

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

2 files changed, 30 insertions, 30 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index c0aa0c98b869..88cfd08ec9b9 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,14 @@
 # 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.311 2011/11/06 05:50:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.312 2011/11/07 04:03:58 tetromino Exp $
+
+*gnome-games-3.2.1 (07 Nov 2011)
+
+  07 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-games-3.0.2.ebuild, +gnome-games-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: aisleriot
+  was split off into a separate package; ggz support is gone; games have been
+  ported to gsettings and pygobject-3.
 
 *gnome-games-2.30.2-r2 (06 Nov 2011)
 
diff --git a/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild b/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild
index 0dae577075b3..ddc4fbfc4ad7 100644
--- a/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild
@@ -1,16 +1,18 @@
 # 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-3.0.2.ebuild,v 1.2 2011/08/23 15:40:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild,v 1.1 2011/11/07 04:03:58 tetromino Exp $
 
 EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.4"
+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 games-ggz eutils gnome2 python virtualx
+inherit autotools games eutils gnome2 python virtualx
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/GnomeGames/"
@@ -22,8 +24,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="artworkextra +aisleriot +clutter +introspection glchess seed +sudoku test"
 
 COMMON_DEPEND="
-	>=dev-games/libggz-0.0.14
-	>=dev-games/ggz-client-libs-0.0.14
 	>=dev-libs/dbus-glib-0.75
 	>=dev-libs/glib-2.25.7
 	>=dev-libs/libxml2-2.4.0
@@ -35,35 +35,31 @@ COMMON_DEPEND="
 	media-libs/libcanberra[gtk3]
 	x11-libs/libSM
 
-	aisleriot? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
 	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
 	clutter? (
 		>=dev-libs/gobject-introspection-0.6.3
 		>=x11-libs/gtk+-2.90:3[introspection]
 		>=gnome-base/gconf-2.31.1[introspection]
 		>=media-libs/clutter-gtk-0.91.6:1.0[introspection]
-		seed? ( dev-libs/seed ) )
+		seed? ( >=dev-libs/seed-2.91.90 ) )
 	introspection? (
 		>=dev-libs/gobject-introspection-0.6.3
 		media-libs/clutter:1.0[introspection] )
 	glchess? (
 		dev-db/sqlite:3
-		>=dev-lang/vala-0.11.6:0.12
 		>=gnome-base/librsvg-2.32
 		virtual/opengl
 		x11-libs/libX11 )"
 RDEPEND="${COMMON_DEPEND}
 	sudoku? (
-		dev-libs/glib:2
-		dev-python/pygobject:2[introspection]
-		dev-python/pycairo
+		|| ( dev-python/pygobject:3 >=dev-python/pygobject-2.28.3:2[introspection] )
 		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/pango[introspection] )
-		>=x11-libs/gtk+-3.0.0:3[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}
-	sys-apps/lsb-release
+	glchess? ( >=dev-lang/vala-0.13.0:0.14 )
 	>=dev-util/pkgconfig-0.15
 	>=dev-util/intltool-0.40.4
 	>=sys-devel/gettext-0.10.40
@@ -72,13 +68,12 @@ DEPEND="${COMMON_DEPEND}
 	>=app-text/gnome-doc-utils-0.10
 	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"
 
-# dang make-check fails on docs with -j > 1.  Restrict them for the moment until
-# it can be chased down.
-RESTRICT="test"
-
 _omitgame() {
 	G2CONF="${G2CONF},${1}"
 }
@@ -87,8 +82,10 @@ pkg_setup() {
 	# create the games user / group
 	games_pkg_setup
 
+	python_set_active_version 2
+	python_pkg_setup
+
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		--disable-schemas-compile
 		--enable-sound
 		$(use_enable introspection)"
@@ -96,17 +93,18 @@ pkg_setup() {
 	# Should be after $(use_enable introspection), but before --enable-omitgames
 	use clutter && G2CONF="${G2CONF} --enable-introspection"
 
-	# Staging games are needed for sudoku, glchess, swell-foop, and lightsoff
+	use glchess && G2CONF="${G2CONF} VALAC=$(type -p valac-0.14)"
+
+	# Staging games are needed for swell-foop and lightsoff
 	G2CONF="${G2CONF}
 		--enable-staging
 		--with-scores-group=${GAMES_GROUP}
 		--with-platform=gnome
-		--with-card-theme-formats=default
 		--with-smclient
 		--with-gtk=3.0
 		--enable-omitgames=none" # This line should be last for _omitgame
 
-	# FIXME: Use REQUIRED_USE once python.eclass is ported to EAPI 4
+	# 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
@@ -120,10 +118,6 @@ pkg_setup() {
 		_omitgame lightsoff
 	fi
 
-	if ! use aisleriot; then
-		_omitgame aisleriot
-	fi
-
 	if ! use glchess; then
 		_omitgame glchess
 	fi
@@ -136,7 +130,7 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	use sudoku && python_convert_shebangs 2 gnome-sudoku/src/gnome-sudoku.in.in
+	use sudoku && python_convert_shebangs -r 2 gnome-sudoku/src
 
 	# TODO: File upstream bug for this
 	epatch "${FILESDIR}/${PN}-2.91.90-fix-conditional-ac-prog-cxx.patch"
@@ -183,14 +177,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	games-ggz_update_modules
 	gnome2_pkg_postinst
 	python_need_rebuild
 	use sudoku && python_mod_optimize gnome_sudoku
 }
 
 pkg_postrm() {
-	games-ggz_update_modules
 	gnome2_pkg_postrm
 	python_mod_cleanup gnome_sudoku
 }