Install the correct screensaver migration instructions, bug 202004

Package-Manager: portage-2.1.4_rc9

3 files changed, 25 insertions, 11 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index a8a46f893a66..419f8917bf60 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.61 2007/11/29 06:09:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.62 2007/12/12 03:03:34 leio Exp $
+
+  12 Dec 2007; Mart Raudsepp <leio@gentoo.org>
+  gnome-screensaver-2.20.0.ebuild:
+  Install the correct screensaver migration instructions, bug 202004
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org>
   gnome-screensaver-2.20.0.ebuild:
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 7a2acd951a8d..3e9c2e637378 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-screensaver-2.16.2-openpam.patch 729 RMD160 7c21188af7a05618667f7b0aa7098a89153c446f SHA1 21dbc7e4419cef2f59adaaddcd5fef84f2d8dd38 SHA256 771644bc11b3c3d750175fda208a44b1747789578c2b19c436c5ba65d5a8fa4c
 MD5 4120f4d802a72346a164ab012a5b5c34 files/gnome-screensaver-2.16.2-openpam.patch 729
 RMD160 7c21188af7a05618667f7b0aa7098a89153c446f files/gnome-screensaver-2.16.2-openpam.patch 729
@@ -26,14 +29,14 @@ EBUILD gnome-screensaver-2.18.2-r1.ebuild 2873 RMD160 6d0d7102037da49212851ea8fe
 MD5 dd49525a85cde01d6a96a8a946e63aed gnome-screensaver-2.18.2-r1.ebuild 2873
 RMD160 6d0d7102037da49212851ea8fe49cd608486ed66 gnome-screensaver-2.18.2-r1.ebuild 2873
 SHA256 9c312a26a527f090a5a217f107fc33fc14ad1637c2e620d35dd60095d59f8016 gnome-screensaver-2.18.2-r1.ebuild 2873
-EBUILD gnome-screensaver-2.20.0.ebuild 2882 RMD160 46993e68bdd9631cdc3af65ef52bfa5ced43eecf SHA1 b5e840de34d17b897cf630706c479f52731520ee SHA256 c075e27a0cfe7c5db27014a19bf49a204e89ecb38032c1aa932ef81f396b6546
-MD5 d854a447d0be78f8e0bdc1c1b6c32031 gnome-screensaver-2.20.0.ebuild 2882
-RMD160 46993e68bdd9631cdc3af65ef52bfa5ced43eecf gnome-screensaver-2.20.0.ebuild 2882
-SHA256 c075e27a0cfe7c5db27014a19bf49a204e89ecb38032c1aa932ef81f396b6546 gnome-screensaver-2.20.0.ebuild 2882
-MISC ChangeLog 9514 RMD160 aea104e5ef21a3ac21164d65c829456347763c81 SHA1 67930d9a9ac657e47cec7cf104ad653388054ebc SHA256 237370a52ec48567df08963b5af4c47ce832aae29a39b08536d07b3eedcf17d1
-MD5 57aa7d4bf835f6f1aec8a31b5a935201 ChangeLog 9514
-RMD160 aea104e5ef21a3ac21164d65c829456347763c81 ChangeLog 9514
-SHA256 237370a52ec48567df08963b5af4c47ce832aae29a39b08536d07b3eedcf17d1 ChangeLog 9514
+EBUILD gnome-screensaver-2.20.0.ebuild 2886 RMD160 f15e0478a5ff80e73475b178d57d9ca8bd5dd2af SHA1 434177800da6b29e1311bd90e4c213aad0e3c8c2 SHA256 76b6557c0be93ecf62d941a02105c482c79f283aa228fcad32e35597f7b73ef1
+MD5 b12afafcbf0401e11a628f49d4806bb1 gnome-screensaver-2.20.0.ebuild 2886
+RMD160 f15e0478a5ff80e73475b178d57d9ca8bd5dd2af gnome-screensaver-2.20.0.ebuild 2886
+SHA256 76b6557c0be93ecf62d941a02105c482c79f283aa228fcad32e35597f7b73ef1 gnome-screensaver-2.20.0.ebuild 2886
+MISC ChangeLog 9667 RMD160 4ef47b1238c81c967fe41285a801fb747c61a8b6 SHA1 6cd2e964b0bca6edbd85d415d0076ca208fabe4c SHA256 a2193583b4bef52a7528561e09b468367dd496a2fa24c2c2a7ad9621e109f7ef
+MD5 e699c8bbf5ff617c462612e836fad8da ChangeLog 9667
+RMD160 4ef47b1238c81c967fe41285a801fb747c61a8b6 ChangeLog 9667
+SHA256 a2193583b4bef52a7528561e09b468367dd496a2fa24c2c2a7ad9621e109f7ef ChangeLog 9667
 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
 MD5 77f62dae0c1bc21d5cf698695368d2d8 metadata.xml 472
 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 metadata.xml 472
@@ -50,3 +53,10 @@ SHA256 0b7c3fd35ec705257fadffe3764c98a40e45de4a053e3ba0169ac00c8fbba2ea files/di
 MD5 2fef754244f92158c9fcded1c3d751ac files/digest-gnome-screensaver-2.20.0 280
 RMD160 5255363acee8dfeb928c395241b60373f3de7c19 files/digest-gnome-screensaver-2.20.0 280
 SHA256 8e3081efba203ba2d4416ae854ebaff8befee5c80701707ce6f88f5b26d8df3d files/digest-gnome-screensaver-2.20.0 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHX092keYb6olFHJcRAjc5AKCENaXNnM89YeajWCqOTKSg/tVavwCg+Zms
+cfub3vPSF5O400D4CyG9wa8=
+=wpdC
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.ebuild
index 298fbfa5116e..d087e8238089 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.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-screensaver/gnome-screensaver-2.20.0.ebuild,v 1.9 2007/11/29 06:09:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.ebuild,v 1.10 2007/12/12 03:03:34 leio Exp $
 
 inherit gnome2
 
@@ -73,7 +73,7 @@ src_install() {
 
 	# Conversion information
 	sed -e "s:\${PF}:${PF}:" \
-		< "${FILESDIR}"/xss-conversion.txt > "${S}"/xss-conversion.txt
+		< "${FILESDIR}"/xss-conversion-2.txt > "${S}"/xss-conversion.txt
 
 	dodoc "${S}"/xss-conversion.txt