Version bump. Build fixes, translation updates.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 49 insertions, 164 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index fbd70df6f369..ff95246bc713 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.273 2009/05/31 12:40:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.274 2009/07/19 11:05:33 eva Exp $
+
+*gnome-games-2.26.3 (19 Jul 2009)
+
+  19 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-games-2.26.1.ebuild, -gnome-games-2.26.2.ebuild,
+  +gnome-games-2.26.3.ebuild,
+  +files/gnome-games-2.26.3-implicit-declaration.patch:
+  Version bump. Build fixes, translation updates.
 
 *gnome-games-2.26.2-r1 (31 May 2009)
 
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.26.3-implicit-declaration.patch b/gnome-extra/gnome-games/files/gnome-games-2.26.3-implicit-declaration.patch
new file mode 100644
index 000000000000..f5bf3518ed50
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.26.3-implicit-declaration.patch
@@ -0,0 +1,11 @@
+diff --git a/dependencies/gnuchess/lexpgn.h b/dependencies/gnuchess/lexpgn.h
+index 91ead55..1b6ca6f 100644
+--- a/dependencies/gnuchess/lexpgn.h
++++ b/dependencies/gnuchess/lexpgn.h
+@@ -24,4 +24,6 @@ extern char *pgn_blackELO;
+ extern char *pgn_result;
+ extern char *pgn_othertags;
+ 
++extern int yylex (void);
++
+ #endif
diff --git a/gnome-extra/gnome-games/gnome-games-2.26.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.26.2.ebuild
deleted file mode 100644
index 183d5506d08f..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.26.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2009 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.26.2.ebuild,v 1.1 2009/05/24 15:44:31 ford_prefect Exp $
-
-EAPI="2"
-
-GCONF_DEBUG="no"
-
-# make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-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"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="artworkextra guile opengl test"
-
-RDEPEND=">=dev-python/pygtk-2.10
-	dev-python/pygobject
-	>=x11-libs/gtk+-2.14
-	>=dev-libs/dbus-glib-0.75
-
-	>=dev-python/gconf-python-2.17.3
-	!sh? ( >=dev-python/bug-buddy-python-2.17.3 )
-	>=dev-python/libgnomeprint-python-2.17.3
-
-	>=x11-libs/cairo-1
-	>=dev-python/pycairo-1
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2.4.0
-	>=gnome-base/librsvg-2.14
-	>=media-libs/gstreamer-0.10.11
-	>=gnome-base/libglade-2
-	>=dev-libs/glib-2.6.3
-	>=dev-games/libggz-0.0.14
-	>=dev-games/ggz-client-libs-0.0.14
-
-	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
-	artworkextra? ( gnome-extra/gnome-games-extra-data )
-	opengl? ( dev-python/pygtkglext )
-	!games-board/glchess
-	x11-libs/libSM"
-
-DEPEND="${RDEPEND}
-	>=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
-
-	# Needs "seed", which needs gobject-introspection, libffi, etc.
-	#$(use_enable clutter)
-	#$(use_enable clutter staging)
-	G2CONF="${G2CONF}
-		--disable-card-themes-installer
-		--with-scores-group=${GAMES_GROUP}
-		--enable-noregistry=\"${GGZ_MODDIR}\"
-		--with-platform=gnome
-		--with-sound=gstreamer
-		--with-card-theme-formats=all
-		--with-smclient
-		--enable-omitgames=none" # This line should be last for _omitgame
-
-	# Needs clutter, always disable till we can have that
-	#if ! use clutter; then
-		_omitgame lightsoff
-	#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/gnome-games-2.26.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.26.3.ebuild
index 66d1399d234e..c432f8d3c8d3 100644
--- a/gnome-extra/gnome-games/gnome-games-2.26.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.26.3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2009 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.26.1.ebuild,v 1.1 2009/05/11 22:35:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.26.3.ebuild,v 1.1 2009/07/19 11:05:33 eva Exp $
 
 EAPI="2"
-
 GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.10"
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
-inherit games games-ggz eutils gnome2 python virtualx
+inherit games games-ggz eutils gnome2 python virtualx autotools
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/GnomeGames/"
@@ -16,7 +16,7 @@ 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 guile opengl test"
+IUSE="artworkextra guile opengl test +gstreamer"
 
 RDEPEND=">=dev-python/pygtk-2.10
 	dev-python/pygobject
@@ -32,7 +32,10 @@ RDEPEND=">=dev-python/pygtk-2.10
 	>=gnome-base/gconf-2
 	>=dev-libs/libxml2-2.4.0
 	>=gnome-base/librsvg-2.14
-	>=media-libs/gstreamer-0.10.11
+	gstreamer? ( >=media-libs/gstreamer-0.10.11 )
+	!gstreamer? (
+		media-libs/libsdl
+		media-libs/sdl-mixer[vorbis] )
 	>=gnome-base/libglade-2
 	>=dev-libs/glib-2.6.3
 	>=dev-games/libggz-0.0.14
@@ -40,7 +43,9 @@ RDEPEND=">=dev-python/pygtk-2.10
 
 	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
 	artworkextra? ( gnome-extra/gnome-games-extra-data )
-	opengl? ( dev-python/pygtkglext )
+	opengl? (
+		dev-python/pygtkglext
+		>=dev-python/pyopengl-3 )
 	!games-board/glchess
 	x11-libs/libSM"
 
@@ -59,7 +64,7 @@ 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"
+#RESTRICT="test"
 
 _omitgame() {
 	G2CONF="${G2CONF},${1}"
@@ -69,15 +74,22 @@ pkg_setup() {
 	# create the games user / group
 	games_pkg_setup
 
+	# Decide the sound backend to use - GStreamer gets preference over SDL
+	if use gstreamer; then
+		G2CONF="${G2CONF} --with-sound=gstreamer"
+	else
+		G2CONF="${G2CONF} --with-sound=sdl_mixer"
+	fi
+
 	# Needs "seed", which needs gobject-introspection, libffi, etc.
 	#$(use_enable clutter)
 	#$(use_enable clutter staging)
 	G2CONF="${G2CONF}
+		$(use_enable test tests)
 		--disable-card-themes-installer
 		--with-scores-group=${GAMES_GROUP}
 		--enable-noregistry=\"${GGZ_MODDIR}\"
 		--with-platform=gnome
-		--with-sound=gstreamer
 		--with-card-theme-formats=all
 		--with-smclient
 		--enable-omitgames=none" # This line should be last for _omitgame
@@ -104,6 +116,15 @@ src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	# Fix parallel make install issue for setgid, bug #267041
+	epatch "${FILESDIR}/${PN}-2.26.2-parallel-make.patch"
+
+	# Fix implicit declaration of yylex.
+	epatch "${FILESDIR}/${PN}-2.26.3-implicit-declaration.patch"
+
+	# If calling eautoreconf, this ebuild uses libtool-2
+	eautomake
 }
 
 src_test() {