Convert python shebangs in gnome-sudoku, it's python2-only; fixes bug #389615, thanks to christianasseburg@yahoo.co.uk for reporting.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 192 insertions, 17 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index a0c1fe05be75..c0aa0c98b869 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,13 @@
 # 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.310 2011/08/23 15:40:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.311 2011/11/06 05:50:58 tetromino Exp $
+
+*gnome-games-2.30.2-r2 (06 Nov 2011)
+
+  06 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-games-2.30.2-r2.ebuild:
+  Convert python shebangs in gnome-sudoku, it's python2-only; fixes bug
+  #389615, thanks to christianasseburg@yahoo.co.uk for reporting.
 
   23 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gnome-games-3.0.2.ebuild:
   Don't depend on glib[introspection]
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index 3430043c8887..bfb83f7b43e1 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnome-games-2.26.3-gtali-invalid-pointer.patch 1145 RMD160 905fa0574296c70a4653914b81cf391205a660d8 SHA1 7384fecdd16fc3b6bf7e10bdd950ab2f8df877ce SHA256 b75190460f701c1830a8eae85c46de23a3735329f840d21383a60ca4445adac0
 AUX gnome-games-2.26.3-implicit-declaration.patch 319 RMD160 c6d868784160c6e10c046d6e117ce6206e1dd49f SHA1 1fa72d174f676b594c61dabb232a9e3a3b98b726 SHA256 7a113e54b4fe50a0d49c5b7b842a03b7f8c494e9f4ee42e9f0ae883dd1bfddcb
@@ -11,23 +11,14 @@ DIST gnome-games-2.30.2.tar.bz2 27683256 RMD160 12c7e5ba3b4a9aca5d9918978e437e77
 DIST gnome-games-3.0.2.tar.bz2 27904074 RMD160 723ca3f8df6c0fc18256afa0c7b7fb515b1a88fb SHA1 cd4ea0336606c1a5799f996c2b740267a78b481d SHA256 1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1
 EBUILD gnome-games-2.28.2.ebuild 4880 RMD160 d6a1322f5dd138275e07c4157daede1eb0411a08 SHA1 94d63d2397ddad63ef6c379bce3f4840c17631e2 SHA256 3bb80a0a011f4815801950681e9e09b23ed7f23a4ad6a57acbc9f3110cf76c98
 EBUILD gnome-games-2.30.2-r1.ebuild 4556 RMD160 42fcc40b6196aca11a452dcf5f3e0f4fea523193 SHA1 9803b219699f73bbab1f837431107dacf9d79330 SHA256 d3e367c1b6fdbe8e58d9d49f9104987d17d0a173096c857b20d81ae7b9c34aae
+EBUILD gnome-games-2.30.2-r2.ebuild 4610 RMD160 03b6238170637eb9fe4e24f22b7b762e3c74344e SHA1 dd8ce569c6f619f8623d0a6d1c5dd201d9a0f7f0 SHA256 5e9ff1cf6fb1dc93c0d547a97212fa48760776a024c9c6007d2b0603399344ff
 EBUILD gnome-games-3.0.2.ebuild 5174 RMD160 c8ffb05f6d63aac5a6fa1ad1de95af9267410b0e SHA1 55320596b8dfc9bc07961221316941ec8b29c0d0 SHA256 14f490a8a274b97c9e2e0b6bf03f72607593f870dfc48fe7b7a613531303209c
-MISC ChangeLog 42287 RMD160 a5796bee175182f986db559cdaa5b2d7c8bc4854 SHA1 e3b9b3f5f0097cf5e0d6871b8b3e3848b68f4b4c SHA256 f872ba36970e73ab36b2ba9b1655147acb12b9fa4e9055d1c65e1536113bc1e6
+MISC ChangeLog 42557 RMD160 49466ef7c6d28689c1398ae14db34b5bd6b598ea SHA1 07288e25521484af7b26421b0bea9f93802e69ef SHA256 49c84348f598b11d9dd54adcabda48ceefef17f2fec59bf6d4b600487c0b2a73
 MISC metadata.xml 836 RMD160 6d78f876600f8e11989df8f818de2adeb377bf6c SHA1 2ef9bad41e6d98b60a44d851c062c5fe06ecac23 SHA256 b233cfdcd3311a14130163329fa9047c65a852526db63dd6c5002b0bcc6d490d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOU8nqAAoJEO/kOhxWD91kGNEP/2jxQAs8jN+w25j2HsQ11XLk
-OXl6MpQcT1tuynzGL55Po9RIxtZ8HRFr5GV/bBj4JfqTeZjlIipFVZSVjbqCgbxj
-tok09DW7Dj1x41gxGcZeFd3wTdOPrZsDX9F57whe+k0lVmI5mKciGdJAejqI24BT
-Q62Nc72755skDQxbYwaV+14uXPomOOM5Q+SjUVWv8uCbmMzItvp3jkSQ1j48ux0n
-K5LFq+00VQHlzG12v0GV+6kNk8aiZvtVtg96TSpAY0/4WzeJ9SXoSYh6zrMPZQrR
-E/Rs/yxvc1LeQeiImkOGTY5ZkKAkA/cD2Nvyspv/AG7N8fvb8zco+D91Yl1JOdn+
-rv3/WTFq+a5+D2IsBoO5sAfoYcd4A3sd978qVDty3z5N/ieb/QElV5rQ2nHIiaE/
-MgdjA4gZgQUOYqhxN1Mcral7AX6CNxy0EbzUQk7UljdVBFxSnT9NDfIoGxJRiExm
-xAiZi5TFTumJsHCH+w+8Hh+TonzpgyYxndhgVT6meRoFRMBQ/tWX9ycm55EXLTsl
-Xu8rNDpLijPOZf8WIE7uME+2ZaUxEIj3hlWEUydGJMkEdP9fwqGcwEixY1hwHok1
-XMKTQwG5P0JIRt6L0/uEBhqRB8+wZS1IdXintdwl/Y+d/VTp/VMXvh20CsCVUIQD
-YyluS+nVxKRWheWxtO5D
-=1jYS
+iF4EAREIAAYFAk62IEgACgkQdjK8w9WeBnBCPgEAiT5jQfA3qwvdEJJE3y2GqqXz
+6GUPR70aOy+wCd91q/EA/0OKmuUToOcQrRkJXs5eWTAzJhuX9/246V6RqF6vPTQI
+=oBwP
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-games/gnome-games-2.30.2-r2.ebuild b/gnome-extra/gnome-games/gnome-games-2.30.2-r2.ebuild
new file mode 100644
index 000000000000..ef879e35faa0
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-2.30.2-r2.ebuild
@@ -0,0 +1,177 @@
+# 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-r2.ebuild,v 1.1 2011/11/06 05:50:58 tetromino Exp $
+
+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
+inherit games games-ggz gnome2 python virtualx
+
+DESCRIPTION="Collection of games for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/GnomeGames/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+
+# 2.30.x versions are not ready to go to stable, please confirm before changing KEYWORDS
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="artworkextra +clutter guile opengl test"
+
+# USE=clutter also enables introspection because gnome-games is the only known
+# consumer of introspection on libgames-support etc. If something else pops up,
+# we'll have to enable it unconditionally because we have no sane way of
+# representing inter-use-flag dependencies
+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.6.3:2
+	>=dev-libs/libxml2-2.4.0:2
+	>=dev-python/gconf-python-2.17.3
+	>=dev-python/pygobject-2:2
+	>=dev-python/pygtk-2.14:2
+	>=dev-python/pycairo-1
+	>=gnome-base/gconf-2:2
+	>=gnome-base/librsvg-2.14:2
+	media-libs/libcanberra[gtk]
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-2.16:2
+	x11-libs/libSM
+
+	artworkextra? ( gnome-extra/gnome-games-extra-data )
+	clutter? (
+		>=dev-libs/gobject-introspection-0.6.3
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.10.2:0.10 )
+	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
+	opengl? (
+		dev-python/pygtkglext
+		>=dev-python/pyopengl-3 )
+	!games-board/glchess"
+RDEPEND="${COMMON_DEPEND}
+	clutter? (
+		dev-libs/seed
+		x11-libs/gtk+:2[introspection]
+		>=media-libs/clutter-1.0.0:1.0[introspection]
+		>=media-libs/clutter-gtk-0.10.2:0.10[introspection] )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/autoconf-2.53
+	>=dev-util/pkgconfig-0.15
+	>=dev-util/intltool-0.40.4
+	>=sys-devel/gettext-0.10.40
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/scrollkeeper-0.3.8
+	>=app-text/gnome-doc-utils-0.10
+	test? ( >=dev-libs/check-0.9.4 )"
+
+# 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}"
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	# create the games user / group
+	games_pkg_setup
+
+	G2CONF="${G2CONF}
+		$(use_enable clutter introspection)
+		--disable-aisleriot-clutter
+		--disable-card-themes-installer
+		--enable-sound
+		--with-scores-group=${GAMES_GROUP}
+		--with-platform=gnome
+		--with-card-theme-formats=all
+		--with-smclient
+		--enable-omitgames=none" # This line should be last for _omitgame
+
+	if ! use clutter; then
+		ewarn "USE=-clutter means no quadrapassel, lightsoff, swell-foop, gnibbles"
+		_omitgame quadrapassel
+		_omitgame lightsoff
+		_omitgame swell-foop
+		_omitgame gnibbles
+	fi
+
+	if ! use guile; then
+		ewarn "USE=-guile implies that Aisleriot won't be installed"
+		_omitgame aisleriot
+	fi
+
+	if ! use opengl; then
+		ewarn "USE=-opengl implies that glchess won't be installed"
+		_omitgame glchess
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	python_convert_shebangs -r 2 gnome-sudoku/src
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+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 "${D}"/var/lib/games/*.scores; do
+		basefile=$(basename $scorefile)
+		if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then
+			cp "${ROOT}/var/lib/games/${basefile}" \
+			"${D}/var/lib/games/${basefile}"
+		fi
+	done
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	games-ggz_update_modules
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize gnome_sudoku
+	if use opengl; then
+		python_mod_optimize glchess
+	fi
+}
+
+pkg_postrm() {
+	games-ggz_update_modules
+	gnome2_pkg_postrm
+	python_mod_cleanup gnome_sudoku
+	if use opengl; then
+		python_mod_cleanup glchess
+	fi
+}