new release, add patch to 2.6.0.1 & 2.6.1 to fix a minor bug

9 files changed, 69 insertions, 59 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 8da0cac0727b..39da509c68dd 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.61 2004/04/17 09:28:10 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.62 2004/05/04 15:54:33 foser Exp $
 
+*gnome-games-2.6.1 (04 May 2004)
+
+  04 May 2004; foser <foser@gentoo.org> gnome-games-2.6.1.ebuild :
+  New release, add patch to fix aisleriot bug (#46738)
+  
   17 Apr 2004; Travis Tilley <lv@gentoo.org> gnome-games-2.4.2.ebuild:
   stable on amd64
 
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index a92ef26cda98..b97288eb7eef 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,13 +1,12 @@
-MD5 2b6c88eeb49f6a2f7bb9177d39808113 ChangeLog 7476
 MD5 eab80ce80acc0b8dfb42c25b5a8dcd17 gnome-games-1.4.0.3-r3.ebuild 1363
-MD5 848cbda2d058b380ba9a07d724577caa gnome-games-2.4.0.ebuild 1062
-MD5 07e89b28a02ea2e97ba9dd1af60a231f gnome-games-2.4.1.1.ebuild 1111
+MD5 442777033e30082be27e60672e64c6c0 gnome-games-2.6.1.ebuild 1497
 MD5 cbc050537873c1a6225b826ca6cc295a gnome-games-2.4.2.ebuild 1313
-MD5 6adbbcb86aafffa8fbe3db0a96ecd75e gnome-games-2.6.0.1.ebuild 1365
+MD5 8bd832d0e21c1beaace65c845fb904b4 gnome-games-2.6.0.1.ebuild 1489
+MD5 856e1e4a077efcaa81b24ea2b1a952fe ChangeLog 7638
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 2301a09a3e02fd7e40f6ee5a7e79e95c files/digest-gnome-games-1.4.0.3-r3 72
-MD5 4cc05e311dbe292c700357abcc9c0f92 files/digest-gnome-games-2.4.0 71
-MD5 948b60f7f3c8398842f54c8a64afc549 files/digest-gnome-games-2.4.1.1 73
-MD5 97e3065e45df12441df89f6ba12f4915 files/digest-gnome-games-2.4.2 71
+MD5 e6684984af39cf3cea7ca09fd08a6552 files/gnome-games-2.6.0.1-aisleriot.patch 491
 MD5 3a5e1fbf83efc9cbd7ce679387b8b2f2 files/digest-gnome-games-2.6.0.1 73
+MD5 2301a09a3e02fd7e40f6ee5a7e79e95c files/digest-gnome-games-1.4.0.3-r3 72
 MD5 94622ab0dcdf1cfbb8f6c51855b3a81e files/guile-1.5-gentoo.diff 318
+MD5 97e3065e45df12441df89f6ba12f4915 files/digest-gnome-games-2.4.2 71
+MD5 bdfd086ef923a4227e5d551f2a482854 files/digest-gnome-games-2.6.1 71
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.4.0 b/gnome-extra/gnome-games/files/digest-gnome-games-2.4.0
deleted file mode 100644
index c479e307a59d..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1a2935642921e7defce3a0a5c54bdbd gnome-games-2.4.0.tar.bz2 7446108
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.4.1.1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.4.1.1
deleted file mode 100644
index c3b9c7f0562f..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-2.4.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78f9ea8374be8bb7b681a9fd16dc8d3f gnome-games-2.4.1.1.tar.bz2 7457270
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.6.1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.6.1
new file mode 100644
index 000000000000..335305b74c36
--- /dev/null
+++ b/gnome-extra/gnome-games/files/digest-gnome-games-2.6.1
@@ -0,0 +1 @@
+MD5 6ea145547bfd8aa828b22cbbe34cbedf gnome-games-2.6.1.tar.bz2 8268693
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.6.0.1-aisleriot.patch b/gnome-extra/gnome-games/files/gnome-games-2.6.0.1-aisleriot.patch
new file mode 100644
index 000000000000..05c3eee2df28
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.6.0.1-aisleriot.patch
@@ -0,0 +1,11 @@
+--- agnes-old.scm	2004-04-20 14:55:07.000000000 -0500
++++ agnes.scm	2004-04-20 14:56:09.000000000 -0500
+@@ -225,7 +225,7 @@
+ 	((or (not (is-visible? (car (reverse card-list))))
+ ;	     (eq? (is-red? (car (reverse card-list)))
+ ;		  (is-black? (car card-list)))
+-	     (not (check-same-color(card-list)))
++	     (not (check-same-color-list card-list))
+ 	     (not (check-straight-descending-list card-list)))
+ 	 (strip (reverse (cdr (reverse card-list)))))
+ 	(#t (car (reverse card-list)))))
diff --git a/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild b/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild
deleted file mode 100644
index d5f74576bddc..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild,v 1.10 2004/03/10 05:51:46 leonardop Exp $
-
-inherit gnome2
-
-DESCRIPTION="Collection of games for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-LICENSE="GPL-2"
-
-RDEPEND=">=app-text/scrollkeeper-0.3.8
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
-	>=sys-devel/gettext-0.10.40
-	${RDEPEND}"
-
-# FIXME
-
-DOCS="AUTHORS COPYING COPYING-DOCS ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
-
-src_install() {
-	gnome2_src_install
-
-	for BLERHG in aisleriot blackjack glines gnect  gnibbles gnobots2 gnome-stones  gnometris gnomine gnotravex gnotski gtali iagno mahjongg same-gnome ; do
-		docinto ${BLERHG}
-		dodoc ${BLERHG}/[AUTHORS,ChangeLog,TODO,NEWS,README,COPYING]
-	done
-}
diff --git a/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild
index 0d053cc5f3f9..96163e2b5e1a 100644
--- a/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild,v 1.1 2004/03/31 22:35:47 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild,v 1.2 2004/05/04 15:54:33 foser Exp $
 
 inherit gnome2
 
@@ -28,6 +28,16 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 
 DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}/aisleriot
+	# fix aisleriot crash #46738
+	epatch ${FILESDIR}/${P}-aisleriot.patch
+
+}
+
 src_install() {
 
 	gnome2_src_install
diff --git a/gnome-extra/gnome-games/gnome-games-2.4.1.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild
index 7d1a0fe1f631..b635c3b4955b 100644
--- a/gnome-extra/gnome-games/gnome-games-2.4.1.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild
@@ -1,43 +1,66 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.4.1.1.ebuild,v 1.5 2004/01/29 05:06:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild,v 1.1 2004/05/04 15:54:33 foser Exp $
 
 inherit gnome2
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2 FDL-1.1"
 
 IUSE="guile"
 SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa ~amd64 ia64"
-LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 
-RDEPEND=">=app-text/scrollkeeper-0.3.8
-	>=gnome-base/gconf-2.0
+RDEPEND=">=x11-libs/gtk+-2.3
+	>=gnome-base/gconf-1.2
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
+	>=gnome-base/librsvg-2
 	guile? ( dev-util/guile )"
 
 DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
+	>=dev-util/intltool-0.29
 	>=sys-devel/gettext-0.10.40
+	>=app-text/scrollkeeper-0.3.8
 	${RDEPEND}"
 
 DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}/aisleriot
+	# fix aisleriot crash #46738
+	epatch ${FILESDIR}/${PN}--2.6.0.1-aisleriot.patch
+
+}
+
 src_install() {
-	gnome2_src_install
 
-	# Documentation install for each of the games
+	gnome2_src_install
 	cd ${S}
-	local GAMES=$( find . -type d -maxdepth 1)
 
-	for game in ${GAMES}; do
+	# Documentation install for each of the games
+	for game in `find . -type d -maxdepth 1`
+	do
 		docinto ${game}
 		dodoc ${game}/{AUTHORS,ChangeLog,TODO,NEWS,README,COPYING} > /dev/null
 	done
 
 	rm -rf ${D}/usr/share/doc/${P}/{libgames-support,po}
 
+	# 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
+		rm ${scorefile}
+	fi
+	done
+
 }