Add new revision that builds clutter games and uses introspection. USE=clutter is package.use.masked till introspection and dev-libs/seed can be unmasked

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 186 insertions, 4 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index f263381caef1..4e69ec48382a 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.288 2010/06/23 15:01:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.289 2010/06/29 08:47:07 nirbheek Exp $
+
+  29 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gnome-games-2.30.2-r1.ebuild, metadata.xml:
+  Add new revision that builds clutter games and uses introspection.
+  USE=clutter is package.use.masked till introspection and dev-libs/seed can
+  be unmasked
+
+*gnome-games-2.30.2-r1 (29 Jun 2010)
+
+  29 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gnome-games-2.30.2-r1.ebuild:
+  Add new revision with clutter games and introspection support enabled
 
   23 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gnome-games-2.24.3.ebuild:
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index 6a8ee7bf7690..28d836e7e313 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -10,6 +10,7 @@ DIST gnome-games-2.30.2.tar.bz2 27683256 RMD160 12c7e5ba3b4a9aca5d9918978e437e77
 EBUILD gnome-games-2.24.3.ebuild 3767 RMD160 59778b22abb9ab1803011dc543d57f9e5ed695f6 SHA1 3e290d2ec37184e17c17ccedb45f6b7ec8ea97c6 SHA256 fa982f89268701b89036060eeb8728f6eb0c6338b45cd2457a6f3249faecd921
 EBUILD gnome-games-2.26.3-r1.ebuild 4664 RMD160 be0d2ebbb3e97d930b39b74376f4187fbbe07160 SHA1 76a0fcbee8555563588499e81f5cf884b9fd859e SHA256 55c3cf2306643ceabdd44302485f6e36457d24adce08b56d9367e56fe77c2b12
 EBUILD gnome-games-2.28.2.ebuild 4920 RMD160 bf20877c27a2173a1ee271dd06bf8dd8b5164a55 SHA1 9177a469db3cbd2b81efa6c942366d42dc274ad6 SHA256 2f4350fa26e139b8c05e9221bec9f77bea19b4d3e7f77ffdad5f84346eb6a6c1
+EBUILD gnome-games-2.30.2-r1.ebuild 4526 RMD160 41a94dbb2277a90b81c6eda242109b90c18a58fc SHA1 3f826d4708dcf5b10460b2c717eb29519defea53 SHA256 0fd2744526577e624b65868f048e6fc43a5dc40a9a65d9b3903029fd71ca0a3d
 EBUILD gnome-games-2.30.2.ebuild 4141 RMD160 072add46c492e2a6ad121072a18281651f5d5bc6 SHA1 903a1b6b88a8427d8dc483aebff841721f204300 SHA256 4cc60aefdd8b4646acddbdacf8d2b551a5d9ac8c22bcd82ffdc13f89202fc227
-MISC ChangeLog 38695 RMD160 2e768ace846d4f2b1674b0bf13952722c61e1f9e SHA1 8ecde1a86870d89a78c283a7fb50083fb7871568 SHA256 8373db93f4bfc793c18932569d8b03daecd8cc6b8b89a1eb981183f5ce185e99
-MISC metadata.xml 304 RMD160 ebc7ab3460bdab0cc0fcb124ec2482b7c3b79ceb SHA1 afc9cf6e7bfd3da93ada733457b62ab623fb5c43 SHA256 f3017e045d0857d145e4c1f6b8d8ed5f45e9cccf1bf565ea5039f854c188d102
+MISC ChangeLog 39155 RMD160 cdabe07a7da3a2bb25818dd112d838bf48feea38 SHA1 54f454e4c492bcffb1174cbb61f47f729c809fe8 SHA256 9b2c10d90f1b60b71b0e0aaf6605014e81fba3495ec23447f952b2ffcdd88ce8
+MISC metadata.xml 469 RMD160 661b9e63299816bfb3f94164ea1c381d89af5081 SHA1 2c6eff1070b37f41776458bad6d5e304ce1b5b51 SHA256 81ec935c3dcf9ddb7ec07386657fb30d9e28b69d2011f318bd4b0f38645b9d79
diff --git a/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild b/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
new file mode 100644
index 000000000000..48acfe5d3483
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/06/29 08:47:07 nirbheek Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.11"
+
+# 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="artworkextra +clutter guile opengl +sound 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
+	>=dev-libs/libxml2-2.4.0
+	>=dev-python/gconf-python-2.17.3
+	>=dev-python/pygobject-2
+	>=dev-python/pygtk-2.14
+	>=dev-python/pycairo-1
+	>=gnome-base/gconf-2
+	>=gnome-base/librsvg-2.14
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-2.16
+	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:1.0 )
+	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
+	opengl? (
+		dev-python/pygtkglext
+		>=dev-python/pyopengl-3 )
+	sound? ( media-libs/libcanberra[gtk] )
+	!games-board/glchess"
+RDEPEND="${COMMON_DEPEND}
+	clutter? (
+		dev-libs/seed
+		x11-libs/gtk+[introspection]
+		>=media-libs/clutter-1.0.0:1.0[introspection]
+		>=media-libs/clutter-gtk-0.10.2:1.0[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() {
+	# create the games user / group
+	games_pkg_setup
+
+	G2CONF="${G2CONF}
+		$(use_enable clutter introspection)
+		$(use_enable sound)
+		--disable-card-themes-installer
+		--disable-aisleriot-clutter
+		--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
+
+	# 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 $(python_get_sitedir)/gnome_sudoku
+	if use opengl; then
+		python_mod_optimize $(python_get_sitedir)/glchess
+	fi
+}
+
+pkg_postrm() {
+	games-ggz_update_modules
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{gnome_sudoku,glchess}
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/glchess
+}
diff --git a/gnome-extra/gnome-games/metadata.xml b/gnome-extra/gnome-games/metadata.xml
index 96420426707e..86c4d9d9fffb 100644
--- a/gnome-extra/gnome-games/metadata.xml
+++ b/gnome-extra/gnome-games/metadata.xml
@@ -4,6 +4,8 @@
 <herd>gnome</herd>
 <use>
 	<flag name='artworkextra'>Installs extra artwork for various games</flag>
-	<flag name='sound'>Enable sound using libcanberra</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='sound'>Enable sound using <pkg>media-libs/libcanberra</pkg></flag>
 </use>
 </pkgmetadata>