Bump to 3.0.2, from gnome overlay for GNOME 3

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

5 files changed, 290 insertions, 4 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/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>