bump to 2.20.0 and fix quoting

Package-Manager: portage-2.1.3.12

6 files changed, 67 insertions, 55 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 426359f4ec4f..dce17ffe4beb 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,11 @@
 # 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.53 2007/10/02 06:36:13 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.54 2007/10/11 22:21:57 eva Exp $
+
+  11 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-screensaver-2.16.2-r1.ebuild, gnome-screensaver-2.16.3-r1.ebuild,
+  gnome-screensaver-2.18.2-r1.ebuild:
+  fix quoting, use of ${PORTAGE_COMPRESS}
 
 *gnome-screensaver-2.20.0 (02 Oct 2007)
 
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 69c118dd076e..f6b72907a91a 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
@@ -14,26 +17,26 @@ DIST gnome-screensaver-2.16.2.tar.bz2 2035452 RMD160 fd0adf8dfaa2a7685bd935b6a21
 DIST gnome-screensaver-2.16.3.tar.bz2 2034974 RMD160 031880cbbd401f51d0ecc0cef69932c09221567c SHA1 d39ca0a7ea271dcd05ea0142079b883d4e6ecf54 SHA256 c07bb2b7d9e32851fc119092ca604a7054ef88804f831daaf3122a02f38761c7
 DIST gnome-screensaver-2.18.2.tar.bz2 2023290 RMD160 cbd5c1985e4224febb5c79665e5a52b39073292d SHA1 b8eed3f520ed8d0f4693f47aa4a91ad50e3008e9 SHA256 428d67dfbfb9fcc69144133e309093877ed0684a4c44afa1f859424159707f5e
 DIST gnome-screensaver-2.20.0.tar.bz2 2013842 RMD160 ddea3d536366aab572462f4f66c72daabbeeb119 SHA1 0b99de04caf897642338c61edc12cb7cea27e0a4 SHA256 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
-EBUILD gnome-screensaver-2.16.2-r1.ebuild 2851 RMD160 3a0f45fc342e26511a4c03070fefba789f06523c SHA1 9e4744a831c0a04678bf6c3105736fdc4f79b0b5 SHA256 b6cb5c2cdd95391866a92bba74db1a434969106ca8e02b44649fa6416bda24ec
-MD5 67fb3ac0a7dc1acb4a530b1645d3613f gnome-screensaver-2.16.2-r1.ebuild 2851
-RMD160 3a0f45fc342e26511a4c03070fefba789f06523c gnome-screensaver-2.16.2-r1.ebuild 2851
-SHA256 b6cb5c2cdd95391866a92bba74db1a434969106ca8e02b44649fa6416bda24ec gnome-screensaver-2.16.2-r1.ebuild 2851
-EBUILD gnome-screensaver-2.16.3-r1.ebuild 2897 RMD160 ff5e481f748cbdf7b34b228cc0e62933abe9dbad SHA1 d25fbea0e57c839d8db05aac10d3afa835183606 SHA256 55b0d8c1aff1d4c9ce068559afe0465edb400cccf61b14452738414b57994c97
-MD5 eed90d249d8b926b4f91bb91bfe17b13 gnome-screensaver-2.16.3-r1.ebuild 2897
-RMD160 ff5e481f748cbdf7b34b228cc0e62933abe9dbad gnome-screensaver-2.16.3-r1.ebuild 2897
-SHA256 55b0d8c1aff1d4c9ce068559afe0465edb400cccf61b14452738414b57994c97 gnome-screensaver-2.16.3-r1.ebuild 2897
-EBUILD gnome-screensaver-2.18.2-r1.ebuild 2848 RMD160 6510d3b1ab2ffe9d31feee2ee7dac0a9732e1289 SHA1 d6fc937d825f35d4d13ad5fa14d12f00611f837d SHA256 18687f06f799ab405f858efc73c86bcdf613c2d4766125ad38fa1773eeedb7b2
-MD5 453084abd938383eb6ab1f0aee346751 gnome-screensaver-2.18.2-r1.ebuild 2848
-RMD160 6510d3b1ab2ffe9d31feee2ee7dac0a9732e1289 gnome-screensaver-2.18.2-r1.ebuild 2848
-SHA256 18687f06f799ab405f858efc73c86bcdf613c2d4766125ad38fa1773eeedb7b2 gnome-screensaver-2.18.2-r1.ebuild 2848
-EBUILD gnome-screensaver-2.20.0.ebuild 2924 RMD160 9ff74e3fe0058c435d35f52f9a74bd9f20417fd7 SHA1 15625456711f0bc7b251b232c6a2d314659e9c55 SHA256 110e4e280498b5c1a4b84c4f081a6a79ab18c85bfa82b62e78c9429377031ff6
-MD5 975e0004fcc8947e34a91acc764667a5 gnome-screensaver-2.20.0.ebuild 2924
-RMD160 9ff74e3fe0058c435d35f52f9a74bd9f20417fd7 gnome-screensaver-2.20.0.ebuild 2924
-SHA256 110e4e280498b5c1a4b84c4f081a6a79ab18c85bfa82b62e78c9429377031ff6 gnome-screensaver-2.20.0.ebuild 2924
-MISC ChangeLog 8473 RMD160 1f3e841b7136ed5d18458d7c3b23237e7f347eab SHA1 c0e3f51b530663fecb333fd8d07ce0c68e62926a SHA256 1252d6ab0e5401cb374dd783a73d63e4d301e4218a54bc4beefa1334e96ecc02
-MD5 a21d23831ddde8059c9dc5633671a96f ChangeLog 8473
-RMD160 1f3e841b7136ed5d18458d7c3b23237e7f347eab ChangeLog 8473
-SHA256 1252d6ab0e5401cb374dd783a73d63e4d301e4218a54bc4beefa1334e96ecc02 ChangeLog 8473
+EBUILD gnome-screensaver-2.16.2-r1.ebuild 2873 RMD160 121811c0a2d43cd0ad25ce6ac12184fe298c7cf4 SHA1 fb9e8c02ede912d6a4aef329d48d8066dc92661e SHA256 b7977bfc9053a12fe8ec25b94f31300d101d47058570f829c892d1d8a0bbb00e
+MD5 8353cafe92b0e827416d845d7b0a54c0 gnome-screensaver-2.16.2-r1.ebuild 2873
+RMD160 121811c0a2d43cd0ad25ce6ac12184fe298c7cf4 gnome-screensaver-2.16.2-r1.ebuild 2873
+SHA256 b7977bfc9053a12fe8ec25b94f31300d101d47058570f829c892d1d8a0bbb00e gnome-screensaver-2.16.2-r1.ebuild 2873
+EBUILD gnome-screensaver-2.16.3-r1.ebuild 2919 RMD160 25a29aa0839bb99a9510f3dfc6d4a2d0305c8742 SHA1 37237a6d9f81b158dab1921787fd169a3aa71b44 SHA256 7e8fc671701f81e094f12c01d6a51512bdacdad3df7cd79d6aa9a5961fcce7f8
+MD5 8120b2bc71e425f56a9e4bcebfa03d68 gnome-screensaver-2.16.3-r1.ebuild 2919
+RMD160 25a29aa0839bb99a9510f3dfc6d4a2d0305c8742 gnome-screensaver-2.16.3-r1.ebuild 2919
+SHA256 7e8fc671701f81e094f12c01d6a51512bdacdad3df7cd79d6aa9a5961fcce7f8 gnome-screensaver-2.16.3-r1.ebuild 2919
+EBUILD gnome-screensaver-2.18.2-r1.ebuild 2873 RMD160 6d0d7102037da49212851ea8fe49cd608486ed66 SHA1 28c3e0b018ea78049b7dfe6907d5262f965372b5 SHA256 9c312a26a527f090a5a217f107fc33fc14ad1637c2e620d35dd60095d59f8016
+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 2884 RMD160 bdabbfd013a7d7776676e0f9fde2eb60bd9f00df SHA1 a5117f21a6dbd8f22cbfde0be0c8412b5c6dd226 SHA256 253d79a83919334393052c78196f119a1ffd2e4d0ffef811a5555c2c7bbfd460
+MD5 7d82e62c66508e18c406cd04c06379db gnome-screensaver-2.20.0.ebuild 2884
+RMD160 bdabbfd013a7d7776676e0f9fde2eb60bd9f00df gnome-screensaver-2.20.0.ebuild 2884
+SHA256 253d79a83919334393052c78196f119a1ffd2e4d0ffef811a5555c2c7bbfd460 gnome-screensaver-2.20.0.ebuild 2884
+MISC ChangeLog 8677 RMD160 90d1a4116c86f55b7b7453f7cfea4ce9a437ccb7 SHA1 4e9b7a248845b66c2b46e464729bfd3b7b63da86 SHA256 bfdf0ce9ab5371c122dd099e88ab338ebedf80efe9d38f0a09d006cd513a93c2
+MD5 39e11f86003ee73a8cd155cb966ad3f8 ChangeLog 8677
+RMD160 90d1a4116c86f55b7b7453f7cfea4ce9a437ccb7 ChangeLog 8677
+SHA256 bfdf0ce9ab5371c122dd099e88ab338ebedf80efe9d38f0a09d006cd513a93c2 ChangeLog 8677
 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)
+
+iD8DBQFHDqIi1fmVwcYIWAYRAvOTAJ44Z3w4iHziAiU7fTfj0rmtSaxSmACg7trL
+KIune+5fN1Z7ldde6bqg9Oo=
+=lpFB
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2-r1.ebuild
index 858625fa8d93..1f5d9252f772 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2-r1.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.16.2-r1.ebuild,v 1.1 2007/07/22 03:06:31 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2-r1.ebuild,v 1.2 2007/10/11 22:21:57 eva Exp $
 
 inherit gnome2 eutils
 
@@ -73,14 +73,14 @@ src_install() {
 	gnome2_src_install
 
 	# Install the conversion script in the documentation
-	dodoc ${S}/data/migrate-xscreensaver-config.sh
-	dodoc ${S}/data/xscreensaver-config.xsl
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
 
 	# Conversion information
 	sed -e "s:\${PF}:${PF}:" \
-		< ${FILESDIR}/xss-conversion.txt > ${S}/xss-conversion.txt
+		< "${FILESDIR}"/xss-conversion.txt > "${S}"/xss-conversion.txt
 
-	dodoc ${S}/xss-conversion.txt
+	dodoc "${S}"/xss-conversion.txt
 
 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when
@@ -100,5 +100,5 @@ pkg_postinst() {
 	ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
 	echo
 	elog "Information for converting screensavers is located in "
-	elog "/usr/share/doc/${PF}/xss-conversion.txt.gz"
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
 }
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3-r1.ebuild
index 8c79fc6b082a..00038d515eea 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3-r1.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.16.3-r1.ebuild,v 1.1 2007/07/22 03:06:31 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3-r1.ebuild,v 1.2 2007/10/11 22:21:57 eva Exp $
 
 inherit gnome2 eutils
 
@@ -74,14 +74,14 @@ src_install() {
 	gnome2_src_install
 
 	# Install the conversion script in the documentation
-	dodoc ${S}/data/migrate-xscreensaver-config.sh
-	dodoc ${S}/data/xscreensaver-config.xsl
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
 
 	# Conversion information
 	sed -e "s:\${PF}:${PF}:" \
-		< ${FILESDIR}/xss-conversion-2.txt > ${S}/xss-conversion.txt
+		< "${FILESDIR}"/xss-conversion-2.txt > "${S}"/xss-conversion.txt
 
-	dodoc ${S}/xss-conversion.txt
+	dodoc "${S}"/xss-conversion.txt
 
 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when
@@ -101,5 +101,5 @@ pkg_postinst() {
 	ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
 	echo
 	elog "Information for converting screensavers is located in "
-	elog "/usr/share/doc/${PF}/xss-conversion.txt.gz"
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
 }
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.2-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.2-r1.ebuild
index f8087775fd59..3a227828d33d 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.2-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.2-r1.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.18.2-r1.ebuild,v 1.8 2007/09/22 08:57:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.2-r1.ebuild,v 1.9 2007/10/11 22:21:57 eva Exp $
 
 inherit gnome2
 
@@ -67,14 +67,14 @@ src_install() {
 	gnome2_src_install
 
 	# Install the conversion script in the documentation
-	dodoc ${S}/data/migrate-xscreensaver-config.sh
-	dodoc ${S}/data/xscreensaver-config.xsl
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
 
 	# Conversion information
 	sed -e "s:\${PF}:${PF}:" \
-		< ${FILESDIR}/xss-conversion-2.txt > ${S}/xss-conversion.txt
+		< "${FILESDIR}"/xss-conversion-2.txt > "${S}"/xss-conversion.txt
 
-	dodoc ${S}/xss-conversion.txt
+	dodoc "${S}"/xss-conversion.txt
 
 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when
@@ -94,5 +94,5 @@ pkg_postinst() {
 	ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
 	echo
 	elog "Information for converting screensavers is located in "
-	elog "/usr/share/doc/${PF}/xss-conversion.txt.gz"
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
 }
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 87c483eca049..43f538135499 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.1 2007/10/02 06:36:13 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.ebuild,v 1.2 2007/10/11 22:21:57 eva Exp $
 
 inherit gnome2
 
@@ -20,22 +20,19 @@ RDEPEND=">=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-menus-2.12
 	>=dev-libs/glib-2.8
 	>=gnome-base/libgnomekbd-0.1
-	||	(
-			>=dev-libs/dbus-glib-0.71
-			~sys-apps/dbus-0.62
-		)
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
+	>=dev-libs/dbus-glib-0.71
 	libnotify? ( x11-libs/libnotify )
 	opengl?	( virtual/opengl )
-	pam? ( virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
 	xinerama?	(
 					x11-libs/libXinerama
 					x11-proto/xineramaproto
-				)"
+				)
+	pam? ( virtual/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
@@ -71,14 +68,14 @@ src_install() {
 	gnome2_src_install
 
 	# Install the conversion script in the documentation
-	dodoc "${S}/data/migrate-xscreensaver-config.sh"
-	dodoc "${S}/data/xscreensaver-config.xsl"
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
 
 	# Conversion information
 	sed -e "s:\${PF}:${PF}:" \
-		< "${FILESDIR}/xss-conversion.txt" > "${S}/xss-conversion.txt"
+		< "${FILESDIR}"/xss-conversion.txt > "${S}"/xss-conversion.txt
 
-	dodoc "${S}/xss-conversion.txt"
+	dodoc "${S}"/xss-conversion.txt
 
 	# Non PAM users will need this suid to read the password hashes.
 	# OpenPAM users will probably need this too when