bump to 2.20.1 and fix some QA warnings

(Portage version: 2.1.3.13)

5 files changed, 117 insertions, 11 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 030a9b991dd9..e2cd3d5c6f86 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.212 2007/10/13 08:33:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.213 2007/10/17 20:37:31 eva Exp $
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-games-2.16.3.ebuild, gnome-games-2.18.2.1.ebuild:
+  fix QA warnings
+
+*gnome-games-2.20.1 (17 Oct 2007)
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-games-2.20.1.ebuild:
+  bump to 2.20.1
 
 *gnome-games-2.20.0.1 (13 Oct 2007)
 
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.20.1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.20.1
new file mode 100644
index 000000000000..8ec3615350aa
--- /dev/null
+++ b/gnome-extra/gnome-games/files/digest-gnome-games-2.20.1
@@ -0,0 +1,3 @@
+MD5 b860b7815c8af1df12fa234dfef4d203 gnome-games-2.20.1.tar.bz2 11701199
+RMD160 1ca3a7a4500875e86d8885f057a95fb8a30a0eea gnome-games-2.20.1.tar.bz2 11701199
+SHA256 af1e34ef29850a29371dff562f9345fb8bcdc754c10beec606aa9ff39b03fb5c gnome-games-2.20.1.tar.bz2 11701199
diff --git a/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild b/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild
index 9a6a4287560c..187c780c647a 100644
--- a/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.16.3.ebuild,v 1.12 2007/08/25 14:21:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild,v 1.13 2007/10/17 20:37:31 eva Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -56,10 +56,10 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Resolve symbols at execution time in setgid binaries
-	epatch ${FILESDIR}/${PN}-2.14.0-no_lazy_bindings.patch
+	epatch "${FILESDIR}"/${PN}-2.14.0-no_lazy_bindings.patch
 
 	# Implement --enable-guile switch
-	epatch ${FILESDIR}/${PN}-2.13.1-guile_switch.patch
+	epatch "${FILESDIR}"/${PN}-2.13.1-guile_switch.patch
 
 	AT_M4DIR="./m4" eautoreconf
 }
@@ -80,7 +80,7 @@ src_install() {
 pkg_preinst() {
 	# Avoid overwriting previous .scores files
 	local basefile
-	for scorefile in ${D}/var/lib/games/*.scores; do
+	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}" \
diff --git a/gnome-extra/gnome-games/gnome-games-2.18.2.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.18.2.1.ebuild
index 92c081d56d00..e05043f6d221 100644
--- a/gnome-extra/gnome-games/gnome-games-2.18.2.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.18.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.2.1.ebuild,v 1.11 2007/09/23 13:25:27 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.18.2.1.ebuild,v 1.12 2007/10/17 20:37:31 eva Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -60,14 +60,14 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Resolve symbols at execution time in setgid binaries
-	epatch ${FILESDIR}/${PN}-2.14.0-no_lazy_bindings.patch
+	epatch "${FILESDIR}"/${PN}-2.14.0-no_lazy_bindings.patch
 
 	# Implement --enable-guile switch
-	epatch ${FILESDIR}/${PN}-2.17.92-guile-switch.patch
+	epatch "${FILESDIR}"/${PN}-2.17.92-guile-switch.patch
 
 	# Fix tests
-	echo "glchess/src/lib/defaults.py" >> ${S}/po/POTFILES.skip
-	echo "gnome-sudoku/src/lib/defaults.py" >> ${S}/po/POTFILES.skip
+	echo "glchess/src/lib/defaults.py" >> "${S}"/po/POTFILES.skip
+	echo "gnome-sudoku/src/lib/defaults.py" >> "${S}"/po/POTFILES.skip
 
 	# Remove intltoolize after upstream uses >=0.35.5 to make tarballs
 	intltoolize --force || die
@@ -91,7 +91,7 @@ src_install() {
 pkg_preinst() {
 	# Avoid overwriting previous .scores files
 	local basefile
-	for scorefile in ${D}/var/lib/games/*.scores; do
+	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}" \
diff --git a/gnome-extra/gnome-games/gnome-games-2.20.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.20.1.ebuild
new file mode 100644
index 000000000000..b8cf5c5ed303
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-2.20.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2007 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.20.1.ebuild,v 1.1 2007/10/17 20:37:31 eva Exp $
+
+# make sure games is inherited first so that the gnome2
+# functions will be called if they are not overridden
+inherit games eutils gnome2 autotools
+
+DESCRIPTION="Collection of games for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="artworkextra guile opengl"
+
+RDEPEND=">=gnome-base/libgnomeui-2.16.0
+	>=gnome-base/libgnome-2.16.0
+	>=dev-python/pygtk-2.10
+	>=dev-python/gnome-python-desktop-2.17.3
+	>=x11-libs/gtk+-2.8
+	>=gnome-base/gconf-2
+	>=x11-libs/cairo-1
+	>=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
+	guile? ( >=dev-scheme/guile-1.6.5 )
+	artworkextra? ( gnome-extra/gnome-games-extra-data )
+	opengl? ( dev-python/pygtkglext )
+	!games-board/glchess"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.53
+	>=dev-util/pkgconfig-0.15
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.10.40
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/scrollkeeper-0.3.8"
+
+# Others are installed below; multiples in this package.
+DOCS="HACKING MAINTAINERS"
+
+pkg_setup() {
+	# create the games user / group
+	games_pkg_setup
+
+	G2CONF="--with-scores-group=${GAMES_GROUP}"
+
+	if use guile; then
+		if has_version =dev-scheme/guile-1.8*; then
+			local flags="deprecated regex"
+			built_with_use dev-scheme/guile ${flags} || die "guile must be built with \"${flags}\" use flags"
+		fi
+	else
+		G2CONF="${G2CONF} --enable-omitgames=aisleriot"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Resolve symbols at execution time in setgid binaries
+	epatch "${FILESDIR}/${PN}-2.14.0-no_lazy_bindings.patch"
+
+	AT_M4DIR="./m4" eautoreconf
+}
+
+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() {
+	# 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
+}