bump to 2.20.0 and fix quoting

(Portage version: 2.1.3.12)

5 files changed, 37 insertions, 35 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/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