[patch] gnome-games.ebuild.diff

gnome-games.ebuild.diff (text/plain), 5.76 KB, created by Pacho Ramos on 2010-12-04 19:36:18 UTC

--- /usr/portage/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild	2010-10-17 18:05:51.000000000 +0200
+++ gnome-games-2.32.1.ebuild	2010-12-04 20:30:17.000000000 +0100
@@ -1,62 +1,52 @@
 # 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.8 2010/10/17 15:45:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.1.ebuild,v 1.1 2010/06/13 21:47:18 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 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
+inherit games games-ggz eutils gnome2 python virtualx
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/GnomeGames/"
 
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2 GPL-3 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd"
-IUSE="artworkextra +clutter guile opengl +sound test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="artworkextra +clutter guile +introspection 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="
+RDEPEND="
 	>=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/glib-2.25.7
 	>=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/gconf-2.31.1[introspection?]
 	>=gnome-base/librsvg-2.14
 	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.16
+	>=x11-libs/gtk+-2.16:2[introspection?]
 	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 )
+	sound? ( media-libs/libcanberra[gtk] )
 	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
+	artworkextra? ( gnome-extra/gnome-games-extra-data )
 	opengl? (
 		dev-python/pygtkglext
 		>=dev-python/pyopengl-3 )
-	sound? ( media-libs/libcanberra[gtk] )
+	clutter? ( >=media-libs/clutter-1.0[gtk,introspection?]
+		>=media-libs/clutter-gtk-0.10[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
 	!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
+
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release
 	>=dev-util/pkgconfig-0.15
 	>=dev-util/intltool-0.40.4
 	>=sys-devel/gettext-0.10.40
@@ -65,9 +55,6 @@
 	>=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"
@@ -80,27 +67,30 @@
 	# create the games user / group
 	games_pkg_setup
 
+	# kde card format needs carddecks from kdegames
+	# the same for pysol
 	G2CONF="${G2CONF}
-		$(use_enable clutter introspection)
 		$(use_enable sound)
-		--disable-card-themes-installer
-		--disable-aisleriot-clutter
+		$(use_enable introspection)
 		--with-scores-group=${GAMES_GROUP}
 		--with-platform=gnome
-		--with-card-theme-formats=all
+		--with-card-theme-formats="svg,fixed"
 		--with-smclient
+		--with-gtk=2.0
 		--enable-omitgames=none" # This line should be last for _omitgame
 
+	# Needs seed, always disable till we can have that
+	_omitgame swell-foop
+	_omitgame lightsoff
+
 	if ! use clutter; then
-		ewarn "USE=-clutter means no quadrapassel, lightsoff, swell-foop, gnibbles"
+		ewarn "USE='-clutter' implies that quadrapassel and gnibbles won't be installed"
 		_omitgame quadrapassel
-		_omitgame lightsoff
-		_omitgame swell-foop
 		_omitgame gnibbles
 	fi
 
 	if ! use guile; then
-		ewarn "USE=-guile implies that Aisleriot won't be installed"
+		ewarn "USE='-guile' implies that Aisleriot won't be installed"
 		_omitgame aisleriot
 	fi
 
@@ -108,6 +98,9 @@
 		ewarn "USE=-opengl implies that glchess won't be installed"
 		_omitgame glchess
 	fi
+
+	# Others are installed below; multiples in this package.
+	DOCS="AUTHORS HACKING MAINTAINERS TODO"
 }
 
 src_prepare() {
@@ -139,11 +132,11 @@
 	gnome2_pkg_preinst
 	# Avoid overwriting previous .scores files
 	local basefile
-	for scorefile in "${D}"/var/lib/games/*.scores; do
+	for scorefile in "${ED}"/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}"
+		if [ -s "${EROOT}/var/lib/games/${basefile}" ]; then
+			cp "${EROOT}/var/lib/games/${basefile}" \
+			"${ED}/var/lib/games/${basefile}"
 		fi
 	done
 }
@@ -153,15 +146,12 @@
 	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
+	python_mod_optimize gnome_sudoku
+	use opengl && python_mod_optimize glchess
 }
 
 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
+	python_mod_cleanup gnome_sudoku glchess
 }