Bump to 3.0.2, from gnome overlay for GNOME 3

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

6 files changed, 309 insertions, 19 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index ef274ec7d53e..ba4de4f81edf 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.308 2011/04/25 21:17:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.309 2011/08/19 12:51:19 nirbheek Exp $
+
+*gnome-games-3.0.2 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch,
+  +gnome-games-3.0.2.ebuild, +files/gnome-games-fix-staging-games.patch,
+  metadata.xml:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
   25 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gnome-games-2.28.2.ebuild, gnome-games-2.30.2-r1.ebuild:
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index 29447109599c..b9a60f43764f 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -4,26 +4,30 @@ Hash: SHA1
 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
 AUX gnome-games-2.28.1-conflicting-types-libgames-support.patch 1038 RMD160 e9c63e9881adbb43cf462a3387d9d0275e1f3598 SHA1 e3b3c30bd32e786bc767fbcee4006a99fea05095 SHA256 074718266310ccdc0ed29affee2dcd28c6e51e557b4db84a320c2e6223f55b8e
+AUX gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch 633 RMD160 4ac7bc6c039c0cd8193230c8c73a8552a888f457 SHA1 9e54584aba6f313a590bb9664c9676097141749b SHA256 902c85ff3f0898b89b75cb077d5b132ad55045fbd18e8c618fae3daee6352e6b
+AUX gnome-games-fix-staging-games.patch 1245 RMD160 8a7f63d6b6c11194f7f46946390d346713890aa8 SHA1 535ee43c9b48fbd2ff946a561470846112e2c311 SHA256 525b90b1bdd69ca9a474daab4a7a79e7494f7dc0e148fd50e9195e64483e0817
 DIST gnome-games-2.28.2.tar.bz2 25498433 RMD160 03c9ca6e899bcc44436b232b126f22a0946dff43 SHA1 c2be79044175df51e610edf4c9fd6fba270c02bf SHA256 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899
 DIST gnome-games-2.30.2.tar.bz2 27683256 RMD160 12c7e5ba3b4a9aca5d9918978e437e774ac0752b SHA1 3541ccc991af82603fc3067863bc27a731302b2c SHA256 57c3f3685cdd49016dfbf236f4a1d98c9d669d456fabe0aeb6f5a4128dba3586
+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
-MISC ChangeLog 41878 RMD160 343821d2acb52cd7dd54a5fca2a29115479989fc SHA1 7f2f032badee8a90b72407fb15e05139b74c5e2d SHA256 34dbcb9e8beed48dc2b30b25752c095133a4a8cde773d0a547d7d4d9ae0cdb0f
-MISC metadata.xml 389 RMD160 930ef5bd4a65295fc5e3092544b9714d126052fc SHA1 cb6dda0d9c528b2c9e0cb66ac32bfa793cf5627c SHA256 8176b49be607cac9efc2a3979dc59f84e1c9f83998dd8603cb465b3f79050dbf
+EBUILD gnome-games-3.0.2.ebuild 5189 RMD160 b3351ac04deb6dd165475006b40098a6fa557a2e SHA1 cb9f11d2bb98600cb51613e6c38add90e8f54c78 SHA256 505bae2e9a17d63c51112b3402bdfcbbb92162e4eb7e15411ecac55ea23d8883
+MISC ChangeLog 42168 RMD160 17fcd140e9c43b9bc0e19658d8df0bf0eeb513f8 SHA1 45d4a8bf5475dae308e87ee46c51676c51b87044 SHA256 cb52382d8a86cfa9671a6164c5f3784600be8d7656751a40ed2ca862fa83f5e7
+MISC metadata.xml 836 RMD160 6d78f876600f8e11989df8f818de2adeb377bf6c SHA1 2ef9bad41e6d98b60a44d851c062c5fe06ecac23 SHA256 b233cfdcd3311a14130163329fa9047c65a852526db63dd6c5002b0bcc6d490d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNteUNAAoJENgZr6v6gHY0V4cP/12TeA4vTyyzkUgKFDWs63FK
-eRB172UnQT1UZjZ7AyaFY0YXDqeGEF55srJOvV155bNVSqPp9XgpEWniv5o5r1X9
-5cQwsdQc763B5MdCnc51XRemCJRNK+MlOz+P4TYXOflb5nCiNR/Vj0qw0WyOD9IF
-BfkOkCD+5S9MZv53I8KIH9X6woYlrp7VcMGKozWVjnXuXcsPNBQ9lwoeGRkBdmuR
-lFXMM7kAEwbkASwgwk9fhOB0/Ov2X1KzZ7CYeHRRa+LkdOYVtxGhOPPYtPQtzah/
-5rM14fWnLf522ZrEqQTehTsY3cZbKtNJNpSvTf23/FM7phrpAw6zbTupiFhfX/ya
-J9Tl+Fba5Ob+cBaSqDNdRRp9eNQwCFNwNRvmCkHHNZYbEKXlV1SlWrW9eCZaRmiU
-c4AO2866OJv3fbKKlBJK3Ti4eGXWLRlwRY7QSYDVyTPR4Vyddx6mQY3y4EsVB7QG
-53CGChwSh8iCvxmiaWaLoKynY/hZ1k2sIdaEHfP4ns6Blp+LhekewnlaF6lb2B4d
-N4pkt2zQq1POuF8uxDWwZW+KoqvC40tAVBtheh0W6fCL/0e9zqpeUMt4J3fBOCne
-PmvytTo0k9/l5h2SIiqxTg1QpbZCZiEFnMUQonlIVKAVO4XO+C1/mG5Fv783sQ/u
-mbwNtGIoy0EhaPfYf6Lk
-=t6HE
+iQIcBAEBAgAGBQJOTlxPAAoJEO/kOhxWD91kJ60QAIFmEWtVcuISsBOafqBnYLfw
+iBrw4zRL7irDt2aA2e9bZtehvMumDXhQzVOSE/F1pAz/Zdwjs+Xg5iQlTlRyAgMU
+fpGm1vR0ArA4ZumlXpn3ntIMEjEAnYKc2XkgnQ/LMjFv2AkjqjXM8k7BO+JPsepe
+w945J+SXT1fNqpDqKYtZANDT+dVkXzIsRVC/hzt7Ra0Bz8+Xw+MGrV5fsRZJSoDq
+U1GKDCzWeig8xTwtZWL2LswN2rpuLMvhwhbxKwYHDVJ9OOpQvT1H+xYCRut46bVA
+LQd2XtjomfZqrYcnlIkPEUt0S99EuiETttk8HA6H8LkboRdzjK2R7hw0g87IO/HN
+xx+9bVlD6gHeK9zONHO1Ctxzzj5IDY1htbIyfdlN71z8dxA0cKpQ/wLn8tDgQagG
+gzwsbsC7o0GCcEhGEbop4tCB1mTLhFKyp2t0B5grQaUyeWmGi4HwUccOYj76+hB7
+3wmC0ckj3t7M7whKC9xVVSyTMofzrgZKhqNDe/w4FXzD2oUJ2i8K5OyAPH9JRHbk
+v+jqekgb3J0Afr1dL7zhn57n5FgCxRt20WG6aDtHljBtivqBhmkailL1I/nJssBx
+/ZqUWLeM1XYbc7HJXDC4a89dMCPr8f4aXvma5aB01mrj8rAqDs9VVWxHGH91ZETI
+WEhetynQm+2ZnU0xGawf
+=obgl
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch
new file mode 100644
index 000000000000..8f350647f05c
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch
@@ -0,0 +1,30 @@
+Don't call AC_PROG_CXX conditionally
+
+Results in the following error during configure:
+
+"""
+configure: error: conditional "am__fastdepCXX" was never defined.
+Usually this means the macro was only invoked conditionally.
+"""
+
+When need_cxx=no because quadrapassel isn't being built.
+
+--- configure.in
++++ configure.in
+@@ -227,6 +227,7 @@
+ PKG_PROG_PKG_CONFIG([0.15])
+ 
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_CPP
+ AC_PROG_LN_S
+ AC_PROG_SED
+@@ -236,8 +237,6 @@
+ fi
+ 
+ if test "$need_cxx" = "yes"; then
+-  AC_PROG_CXX
+-
+   # Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
+   # doesn't exist)
+   AC_LANG_PUSH([C++])
diff --git a/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch b/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch
new file mode 100644
index 000000000000..eef7f23ad159
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch
@@ -0,0 +1,44 @@
+The --enable-staging flag was enabling *all* games, regardless of what
+$enable_omitgames contained.
+
+---
+--- configure.in
++++ configure.in
+@@ -60,6 +60,18 @@
+   gamelist="$allgames"   
+ fi
+ 
++## This is the staging area
++## These games aren't quite ready for prime-time
++
++AC_MSG_CHECKING([whether to enable staging games])
++AC_ARG_ENABLE([staging],
++  [AS_HELP_STRING([--enable-staging],[whether to enable beta game support (default: disabled)])],[],[])
++AC_MSG_RESULT([$enable_staging])
++
++if test "$enable_staging" = "yes"; then
++	allgames="${allgames} ${staginggames}"
++fi
++
+ ## This has a particularly silly name because autoconf doesn't allow 
+ ## --disable-foo to have arguments so we have to use an --enable-fubar form.
+ AC_ARG_ENABLE(omitgames,
+@@ -90,18 +102,6 @@
+    gamelist=${allgames}
+ fi
+ 
+-## This is the staging area
+-## These games aren't quite ready for prime-time
+-
+-AC_MSG_CHECKING([whether to enable staging games])
+-AC_ARG_ENABLE([staging],
+-  [AS_HELP_STRING([--enable-staging],[whether to enable beta game support (default: disabled)])],[],[])
+-AC_MSG_RESULT([$enable_staging])
+-
+-if test "$enable_staging" = "yes"; then
+-	gamelist="${gamelist} ${staginggames}"
+-fi
+-
+ AC_MSG_RESULT([$gamelist])
+ 
+ AC_SUBST([gamelist])
diff --git a/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
new file mode 100644
index 000000000000..32aedb58e3d7
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
@@ -0,0 +1,196 @@
+# 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.1 2011/08/19 12:51:19 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+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 autotools games games-ggz 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 +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
+	>=gnome-base/gconf-2.31.1
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-2.91.7:3[introspection?]
+
+	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 ) )
+	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[introspection]
+		dev-python/pygobject:2[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}
+	sys-apps/lsb-release
+	>=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() {
+	# create the games user / group
+	games_pkg_setup
+
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-schemas-compile
+		--enable-sound
+		$(use_enable introspection)"
+
+	# 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
+	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
+	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
+		use seed && ewarn "USE='seed' has no effect with USE='-clutter'"
+	elif ! use seed; then
+		ewarn "USE='-seed' => swell-foop, lightsoff won't be installed"
+		_omitgame swell-foop
+		_omitgame lightsoff
+	fi
+
+	if ! use aisleriot; then
+		_omitgame aisleriot
+	fi
+
+	if ! use glchess; then
+		_omitgame glchess
+	fi
+
+	if ! use sudoku; then
+		_omitgame gnome-sudoku
+	fi
+}
+
+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"
+
+	# Without this, --enable-staging enables all those games unconditionally
+	epatch "${FILESDIR}/${PN}-fix-staging-games.patch"
+
+	eautoreconf
+
+	# 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 "${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
+	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
+}
diff --git a/gnome-extra/gnome-games/metadata.xml b/gnome-extra/gnome-games/metadata.xml
index 21dc87acaa4b..321230ec919f 100644
--- a/gnome-extra/gnome-games/metadata.xml
+++ b/gnome-extra/gnome-games/metadata.xml
@@ -3,8 +3,16 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name='artworkextra'>Installs extra artwork for various games</flag>
-	<flag name='clutter'>Build games that use <pkg>media-libs/clutter</pkg> and
-		are written in JavaScript using <pkg>dev-libs/seed</pkg></flag>
+	<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="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+		for introspection</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>