Move scorefile checks to pkg_preinst; bug #167277

Package-Manager: portage-2.1.2-r9

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index d6309f659c72b53c3ef2b1996c72dd0bfdee0b4c..b0f181732a17aebedefd239930a43711ac5dbcc2 100644 (file)
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,11 @@
 # 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.188 2007/02/05 13:13:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.189 2007/02/18 03:43:57 dang Exp $
+
+  18 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  gnome-games-2.14.2.1.ebuild, gnome-games-2.16.2.ebuild,
+  gnome-games-2.16.3.ebuild:
+  Move scorefile checks to pkg_preinst; bug #167277
 
 *gnome-games-2.16.3 (05 Feb 2007)
 

diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index f8105ef1f2732e6f9e9805b3ac0d06471693d4b2..5fbc92137f6899f154a136eebf4e08e03b1b93df 100644 (file)
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -12,22 +12,22 @@ SHA256 1d77a19b5d940ff23ee3110feb1ccc37a920e722c2cc0304abaf7a745cfab99d files/gn
 DIST gnome-games-2.14.2.1.tar.bz2 5057108 RMD160 ef35b8c712d466eefd936aaecb05efa77f748967 SHA1 e1ce2365084abfb0f4a6b8ef38d6e0fdda57bf5e SHA256 2d57e34b28a648f96d41d92252267f6f374d4461f66f781175d006bed653fcd8
 DIST gnome-games-2.16.2.tar.bz2 5257581 RMD160 0d78978f7fd6a254a06f6c8b08950d33958ae6a0 SHA1 e40e10794834c3662f320f90da663d9de3936cac SHA256 a6b20aa2684f223a41521d28c6b6e8a10ef9c9ad0540e5389564404ddd591a25
 DIST gnome-games-2.16.3.tar.bz2 5276299 RMD160 2f2f3dd316a5a11bb18046bed5e1505dc1a08b3f SHA1 38393162ec3ccfa2639e611a478516f6d810d5a7 SHA256 7c32dc59819cbf22787d5ac1fde221a4cd38a20de33831246e12811520294d05
-EBUILD gnome-games-2.14.2.1.ebuild 1979 RMD160 c128677150333328bdc4983f6c54f79f56633e6e SHA1 8414b5585e328065362c13a7815f2de171492697 SHA256 4a6d10100138a4fd8124180965ae52f703fc8c2841371e22c5c61669c97dea54
-MD5 dc5749fb894b9e81c88eec57f1a17c47 gnome-games-2.14.2.1.ebuild 1979
-RMD160 c128677150333328bdc4983f6c54f79f56633e6e gnome-games-2.14.2.1.ebuild 1979
-SHA256 4a6d10100138a4fd8124180965ae52f703fc8c2841371e22c5c61669c97dea54 gnome-games-2.14.2.1.ebuild 1979
-EBUILD gnome-games-2.16.2.ebuild 2184 RMD160 d5fe71d7e2dddef417a41ca77864598f10e2809c SHA1 fde32dd39c55795017af037d835f35237194eeff SHA256 7d01fb605c28ca663215c83b23e5ae2d425da4a7d5652c69da4dd8305a7dc2a0
-MD5 4811433f4e34abf2f3053883499a686b gnome-games-2.16.2.ebuild 2184
-RMD160 d5fe71d7e2dddef417a41ca77864598f10e2809c gnome-games-2.16.2.ebuild 2184
-SHA256 7d01fb605c28ca663215c83b23e5ae2d425da4a7d5652c69da4dd8305a7dc2a0 gnome-games-2.16.2.ebuild 2184
-EBUILD gnome-games-2.16.3.ebuild 2193 RMD160 956017d2a60ad47ffef344bf1cc49204577247aa SHA1 baa14a940a537a61513fc34b2c881f444ff683c1 SHA256 58ca4c38e1dc904e0e0f7f549b0bee3b4e1961fe84a72d20c1697765deaad30f
-MD5 1cc802a510298a83269208ff2550d479 gnome-games-2.16.3.ebuild 2193
-RMD160 956017d2a60ad47ffef344bf1cc49204577247aa gnome-games-2.16.3.ebuild 2193
-SHA256 58ca4c38e1dc904e0e0f7f549b0bee3b4e1961fe84a72d20c1697765deaad30f gnome-games-2.16.3.ebuild 2193
-MISC ChangeLog 24100 RMD160 d5fb4f80cdd309bd0118debb0973d875583211d1 SHA1 40d2ed663a8ba00f5ef2392c25120b4f228d1c11 SHA256 64d9901ceeeee2e51f8910a2a4396d4dc95d227326ffc2a94cef96c9c144c57a
-MD5 5b0f1207fef371089012430ac7bea09f ChangeLog 24100
-RMD160 d5fb4f80cdd309bd0118debb0973d875583211d1 ChangeLog 24100
-SHA256 64d9901ceeeee2e51f8910a2a4396d4dc95d227326ffc2a94cef96c9c144c57a ChangeLog 24100
+EBUILD gnome-games-2.14.2.1.ebuild 2057 RMD160 77639544e2e376a0832c9b5369db3acd62df633e SHA1 46d343d177569b6df109594aa4cfb750b2451f7b SHA256 e98e270ab405750abd46e668c743c52f6b9f8342c4198dceefdd20ac3afba861
+MD5 24cc6b772619f583ad9bf628897f8f14 gnome-games-2.14.2.1.ebuild 2057
+RMD160 77639544e2e376a0832c9b5369db3acd62df633e gnome-games-2.14.2.1.ebuild 2057
+SHA256 e98e270ab405750abd46e668c743c52f6b9f8342c4198dceefdd20ac3afba861 gnome-games-2.14.2.1.ebuild 2057
+EBUILD gnome-games-2.16.2.ebuild 2263 RMD160 ae8726f4063822bb817276207e755b12bf47c2d3 SHA1 982818f2c9a738a3b447e01e07cf24ec20d638d1 SHA256 d50d50733416aea44b1128ee86f5d74c79f4192623615a3aa966456f9e6dbb40
+MD5 0e94564491f4d121d02d17044fcb9825 gnome-games-2.16.2.ebuild 2263
+RMD160 ae8726f4063822bb817276207e755b12bf47c2d3 gnome-games-2.16.2.ebuild 2263
+SHA256 d50d50733416aea44b1128ee86f5d74c79f4192623615a3aa966456f9e6dbb40 gnome-games-2.16.2.ebuild 2263
+EBUILD gnome-games-2.16.3.ebuild 2272 RMD160 76065676e7fcd6814678d56bad2eb3e4d559823d SHA1 27469e973ff5274d2f441b5f48d283718af60837 SHA256 c5859b4303c0cc831920d15597e219cfb001ad47870b2a95636d3a88f202edb3
+MD5 6f3cf805cbfcf867cc96904dc7c42d4c gnome-games-2.16.3.ebuild 2272
+RMD160 76065676e7fcd6814678d56bad2eb3e4d559823d gnome-games-2.16.3.ebuild 2272
+SHA256 c5859b4303c0cc831920d15597e219cfb001ad47870b2a95636d3a88f202edb3 gnome-games-2.16.3.ebuild 2272
+MISC ChangeLog 24291 RMD160 201a3467ddc53b36871bb448e5fc91b760c3ed95 SHA1 aeb7ebb3bd677861a3c76c0263c494d68012da4b SHA256 fc66519dcd1cbfa2c9a4003573ba14c9edab7a86433a400b308e7617bbdb4b89
+MD5 d254bfaeaaa931155bfb73ee46ca72a7 ChangeLog 24291
+RMD160 201a3467ddc53b36871bb448e5fc91b760c3ed95 ChangeLog 24291
+SHA256 fc66519dcd1cbfa2c9a4003573ba14c9edab7a86433a400b308e7617bbdb4b89 ChangeLog 24291
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -42,9 +42,9 @@ MD5 e231c387b716a5f3ce2cdb58e8aba6de files/digest-gnome-games-2.16.3 262
 RMD160 cd260ae84ca317128ed5a5fb864e3196197b2b77 files/digest-gnome-games-2.16.3 262
 SHA256 da66ebc27e3fff1bf25f4d4d2cce39bbe85a1dfe72227c6b719cff251450fd11 files/digest-gnome-games-2.16.3 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxy1vkeYb6olFHJcRAheOAKDDEzJMGUQoJ32Zr2bwROkhSnzpEACffMwA
-y82U/KGVineMkn/ltuCVO9o=
-=QOk/
+iD8DBQFF18t0omPajV0RnrERAnxsAJ4zrepRCMnOJeOszfIVgK7qkxrSiACfaT/c
+LDVGug9fOxMYlIOCdYlaJcI=
+=kvt4
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild
index 54160bb74553bf25d720da28b953df9f7a320814..b384bafa2e03b7ec8f330e925ef82eacbfacbffe 100644 (file)
--- a/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.14.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.14.2.1.ebuild,v 1.16 2007/01/10 19:44:50 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild,v 1.17 2007/02/18 03:43:57 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -66,13 +66,16 @@ src_install() {
                        [ -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
-                       rm ${scorefile}
+                       cp "${ROOT}/var/lib/games/${basefile}" \
+                       "${D}/var/lib/games/${basefile}"
                fi
        done
 }

diff --git a/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild
index 4e888fcd7ce450bb554f1bbef01a60aab32d075a..d8f60fb82b931be1b5404debaf94c481450ea75f 100644 (file)
--- a/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.16.2.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.2.ebuild,v 1.12 2007/02/04 16:31:58 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild,v 1.13 2007/02/18 03:43:57 dang Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -68,13 +68,16 @@ src_install() {
                        [ -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
-                       rm ${scorefile}
+                       cp "${ROOT}/var/lib/games/${basefile}" \
+                       "${D}/var/lib/games/${basefile}"
                fi
        done
 }

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 c519e155b419bda42cbf23f718d4b122afe241d9..86939cc9e987d6198e029990bb3147ccad657544 100644 (file)
--- 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.1 2007/02/05 13:13:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild,v 1.2 2007/02/18 03:43:57 dang Exp $
 
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
@@ -68,13 +68,16 @@ src_install() {
                        [ -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
-                       rm ${scorefile}
+                       cp "${ROOT}/var/lib/games/${basefile}" \
+                       "${D}/var/lib/games/${basefile}"
                fi
        done
 }