Avoid overwriting .scores files. Closes bug #43196.

5 files changed, 26 insertions, 12 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 01a096c3394f..584e4f019961 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,10 @@
 # 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.56 2004/03/09 23:26:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.57 2004/03/10 05:51:46 leonardop Exp $
+
+  10 Mar 2004; L. Boshell <leonardop@gentoo.org> gnome-games-2.4.2.ebuild:
+  Avoid overwriting previous .scores files under /var/lib/games. Closes
+  bug #43196.
 
   09 Mar 2004; <agriffis@gentoo.org> gnome-games-2.4.2.ebuild:
   stable on alpha and ia64
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index de043615df76..d6c3db9572a2 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,7 +1,7 @@
-MD5 06e6f569ac54ca2c38793efe20c024a3 gnome-games-1.4.0.3-r3.ebuild 1362
-MD5 ebf41b7a44f8e2f192005b76737a82ca ChangeLog 6851
-MD5 e7a66f98a72463c3f7a0834a22449b84 gnome-games-2.4.2.ebuild 1109
-MD5 db5c3c054bd3b4cb94f06b0ad4ea5986 gnome-games-2.4.0.ebuild 1058
+MD5 a440e61752a9745b15cdfd7437285e78 ChangeLog 7014
+MD5 eab80ce80acc0b8dfb42c25b5a8dcd17 gnome-games-1.4.0.3-r3.ebuild 1363
+MD5 af0ad1a8a2b45c82e4aeb6b5512a2e46 gnome-games-2.4.2.ebuild 1315
+MD5 848cbda2d058b380ba9a07d724577caa gnome-games-2.4.0.ebuild 1062
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 07e89b28a02ea2e97ba9dd1af60a231f gnome-games-2.4.1.1.ebuild 1111
 MD5 2301a09a3e02fd7e40f6ee5a7e79e95c files/digest-gnome-games-1.4.0.3-r3 72
diff --git a/gnome-extra/gnome-games/gnome-games-1.4.0.3-r3.ebuild b/gnome-extra/gnome-games/gnome-games-1.4.0.3-r3.ebuild
index ecdf11fbe692..b048b2ea46c8 100644
--- a/gnome-extra/gnome-games/gnome-games-1.4.0.3-r3.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-1.4.0.3-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Reviewed by Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-1.4.0.3-r3.ebuild,v 1.12 2004/02/22 20:50:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-1.4.0.3-r3.ebuild,v 1.13 2004/03/10 05:51:46 leonardop Exp $
 
 IUSE="nls"
 
diff --git a/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild b/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild
index 660465a25523..d5f74576bddc 100644
--- a/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.9 2003/12/13 01:05:24 gmsoft Exp $
+# $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
 
diff --git a/gnome-extra/gnome-games/gnome-games-2.4.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.4.2.ebuild
index b254f9ba1972..2c3cda79a189 100644
--- a/gnome-extra/gnome-games/gnome-games-2.4.2.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.4.2.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.4.2.ebuild,v 1.5 2004/03/09 23:26:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.4.2.ebuild,v 1.6 2004/03/10 05:51:46 leonardop Exp $
 
 inherit gnome2
 
@@ -31,13 +31,23 @@ src_install() {
 
 	# Documentation install for each of the games
 	cd ${S}
-	local GAMES=$( find . -type d -maxdepth 1)
 
-	for game in ${GAMES}; do
+	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
 }