bump to 2.20.3 and clean up old revisions

(Portage version: 2.1.4_rc14)

7 files changed, 16 insertions, 156 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index ea6402cfbced..6bc90a11c2bd 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,13 @@
 # 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.221 2007/12/06 22:37:02 eva Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.222 2008/01/09 23:28:09 eva Exp $
+
+*gnome-games-2.20.3 (09 Jan 2008)
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-games-2.13.1-guile_switch.patch, -gnome-games-2.16.3.ebuild,
+  -gnome-games-2.20.0.1.ebuild, +gnome-games-2.20.3.ebuild:
+  bump to 2.20.3 and clean up old revisions
 
 *gnome-games-2.20.2 (06 Dec 2007)
 
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.16.3 b/gnome-extra/gnome-games/files/digest-gnome-games-2.16.3
deleted file mode 100644
index bcd04d3fdee4..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-2.16.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 88baa9ab64b84bfcac2a1ba05f84d2f9 gnome-games-2.16.3.tar.bz2 5276299
-RMD160 2f2f3dd316a5a11bb18046bed5e1505dc1a08b3f gnome-games-2.16.3.tar.bz2 5276299
-SHA256 7c32dc59819cbf22787d5ac1fde221a4cd38a20de33831246e12811520294d05 gnome-games-2.16.3.tar.bz2 5276299
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.20.0.1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.20.0.1
deleted file mode 100644
index aca954a5937a..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-2.20.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b852cfe1f65c076b8af4fa9c7383a35f gnome-games-2.20.0.1.tar.bz2 11498035
-RMD160 450b3d3be6571414e9c82069a49d8d979de6624d gnome-games-2.20.0.1.tar.bz2 11498035
-SHA256 697840b4decc091a3999a1964f00ae22cc4febdfc5da8dd2ae0ec536cc694206 gnome-games-2.20.0.1.tar.bz2 11498035
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.20.3 b/gnome-extra/gnome-games/files/digest-gnome-games-2.20.3
new file mode 100644
index 000000000000..e622beb42225
--- /dev/null
+++ b/gnome-extra/gnome-games/files/digest-gnome-games-2.20.3
@@ -0,0 +1,3 @@
+MD5 470bec8560c931609f89aae94977d799 gnome-games-2.20.3.tar.bz2 12900338
+RMD160 3f57831b9ee9e8c0e844ba5d101805462776ec84 gnome-games-2.20.3.tar.bz2 12900338
+SHA256 b9cbef6959fb26b7be1a27d9a2a2e5f33c167fccf13afcb49c4a0900f1d11422 gnome-games-2.20.3.tar.bz2 12900338
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.13.1-guile_switch.patch b/gnome-extra/gnome-games/files/gnome-games-2.13.1-guile_switch.patch
deleted file mode 100644
index e9a1701900b3..000000000000
--- a/gnome-extra/gnome-games/files/gnome-games-2.13.1-guile_switch.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-games-2.13.1.orig/configure.in gnome-games-2.13.1/configure.in
---- gnome-games-2.13.1.orig/configure.in	2005-10-24 05:49:33.000000000 -0400
-+++ gnome-games-2.13.1/configure.in	2005-11-15 14:16:32.000000000 -0500
-@@ -30,24 +30,32 @@
- dnl out if the _development_ files are present. guile-config returns
- dnl a value regardless of what is actually installed. The problem
- dnl with this is if the header ever gets moved to a non-default location.
--AC_CHECK_HEADER([libguile.h], [GUILE_PRESENT=yes], [GUILE_PRESENT=no])
--if test "$GUILE_PRESENT" = "yes" ; then
--  GUILE_CFLAGS=`guile-config compile`
--  GUILE_LDFLAGS=`guile-config link`
--  AC_SUBST(GUILE_CFLAGS)
--  AC_SUBST(GUILE_LDFLAGS)
--  dnl On 64-bit machines guile < 1.6.5 causes a crash in aisleriot.
--  dnl But since 1.6.5 is only a few months old as I write this we 
--  dnl will be more lenient with 32-bit machines.
--  if uname -m | grep -q 64 ; then
--     GUILE_TARGET="1.6.5"
--  else 
--     GUILE_TARGET="1.6.0"
--  fi
--  if test `guile -c '(if (string<? (version) (cadr (command-line))) (display "no") (display "yes")) (newline)' $GUILE_TARGET` != yes ; then 
--    GUILE_PRESENT="no"
--    AC_MSG_WARN([Your version of guile is too old, please install a recent guile package (>= $GUILE_TARGET)])
--  fi
-+AC_MSG_CHECKING([whether guile support is requested])
-+AC_ARG_ENABLE([guile],
-+  AS_HELP_STRING([--enable-guile],[Enable guile use for Aisleriot (default=yes)]),
-+  [enable_guile=$enableval],
-+  [enable_guile=yes])
-+AC_MSG_RESULT([$enable_guile])
-+if test x$enable_guile = xyes; then
-+ AC_CHECK_HEADER([libguile.h], [GUILE_PRESENT=yes], [GUILE_PRESENT=no])
-+ if test "$GUILE_PRESENT" = "yes" ; then
-+   GUILE_CFLAGS=`guile-config compile`
-+   GUILE_LDFLAGS=`guile-config link`
-+   AC_SUBST(GUILE_CFLAGS)
-+   AC_SUBST(GUILE_LDFLAGS)
-+   dnl On 64-bit machines guile < 1.6.5 causes a crash in aisleriot.
-+   dnl But since 1.6.5 is only a few months old as I write this we 
-+   dnl will be more lenient with 32-bit machines.
-+   if uname -m | grep -q 64 ; then
-+      GUILE_TARGET="1.6.5"
-+   else 
-+      GUILE_TARGET="1.6.0"
-+   fi
-+   if test `guile -c '(if (string<? (version) (cadr (command-line))) (display "no") (display "yes")) (newline)' $GUILE_TARGET` != yes ; then 
-+     GUILE_PRESENT="no"
-+     AC_MSG_WARN([Your version of guile is too old, please install a recent guile package (>= $GUILE_TARGET)])
-+   fi
-+ fi
- fi
- AM_CONDITIONAL([HAVE_GUILE], [test "x$GUILE_PRESENT" = xyes])
- 
diff --git a/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild b/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild
deleted file mode 100644
index 187c780c647a..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.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
-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" #avahi disabled upstream due to crashes
-
-RDEPEND=">=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnome-2
-	>=x11-libs/gtk+-2.8
-	>=gnome-base/librsvg-2
-	>=gnome-base/libglade-2
-	>=dev-libs/glib-2.6.3
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/cairo-1
-	guile? ( >=dev-scheme/guile-1.6.5 )
-	artworkextra? ( gnome-extra/gnome-games-extra-data )
-	>=gnome-base/gnome-common-2.12.0"
-#	avahi? ( net-dns/avahi )
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.10.40
-	>=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} \
-		$(use_enable guile)"
-#		$(use_enable avahi)"
-
-	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
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Resolve symbols at execution time in setgid binaries
-	epatch "${FILESDIR}"/${PN}-2.14.0-no_lazy_bindings.patch
-
-	# Implement --enable-guile switch
-	epatch "${FILESDIR}"/${PN}-2.13.1-guile_switch.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
-}
diff --git a/gnome-extra/gnome-games/gnome-games-2.20.0.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.20.3.ebuild
index 137e506c73d2..42ad71193418 100644
--- a/gnome-extra/gnome-games/gnome-games-2.20.0.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.20.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.0.1.ebuild,v 1.2 2007/10/13 22:47:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.20.3.ebuild,v 1.1 2008/01/09 23:28:09 eva Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="artworkextra guile opengl"
 
 RDEPEND=">=gnome-base/libgnomeui-2.16.0
@@ -64,7 +64,7 @@ src_unpack() {
 	# Resolve symbols at execution time in setgid binaries
 	epatch "${FILESDIR}/${PN}-2.14.0-no_lazy_bindings.patch"
 
-	AT_M4DIR="./m4" eautoreconf
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_install() {