New version for GNOME-2.22. Uses GIO, new theme transfer progress dialog.

Fix some long standing automagic deps (Xxf86{misc,vm}).
(Portage version: 2.1.4.4)

2 files changed, 38 insertions, 31 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 09a5768f0aef..8bec58f1d1ce 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.70 2008/03/22 03:51:30 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.71 2008/03/23 12:28:47 eva Exp $
+
+*gnome-screensaver-2.22.0 (23 Mar 2008)
+
+  23 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-screensaver-2.20.0.ebuild, +gnome-screensaver-2.22.0.ebuild:
+  New version for GNOME-2.22. Uses GIO, new theme transfer progress dialog.
+  Fix some long standing automagic deps (Xxf86{misc,vm}).
 
   22 Mar 2008; Daniel Gryniewicz <dang@gentoo.org>
   gnome-screensaver-2.20.0-r2.ebuild:
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0.ebuild
index d087e8238089..a46a9a0359c0 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.10 2007/12/12 03:03:34 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0.ebuild,v 1.1 2008/03/23 12:28:47 eva Exp $
 
 inherit gnome2
 
@@ -9,58 +9,58 @@ HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 KERNEL_IUSE="kernel_linux"
 IUSE="debug doc libnotify opengl pam xinerama $KERNEL_IUSE"
 
 RDEPEND=">=gnome-base/gconf-2.6.1
 	>=x11-libs/gtk+-2.11.5
-	>=gnome-base/gnome-vfs-2.12
 	>=gnome-base/libglade-2.5.0
 	>=gnome-base/gnome-menus-2.12
-	>=dev-libs/glib-2.8
+	>=dev-libs/glib-2.15
 	>=gnome-base/libgnomekbd-0.1
 	>=dev-libs/dbus-glib-0.71
 	libnotify? ( x11-libs/libnotify )
 	opengl?	( virtual/opengl )
-	xinerama?	(
-					x11-libs/libXinerama
-					x11-proto/xineramaproto
-				)
+	xinerama? ( x11-libs/libXinerama )
 	pam? ( virtual/pam )
 	!pam? ( kernel_linux? ( sys-apps/shadow ) )
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrandr
-	x11-libs/libXScrnSaver"
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35
-	doc?	(
-				app-text/xmlto
-				~app-text/docbook-xml-dtd-4.1.2
-				~app-text/docbook-xml-dtd-4.4
-			)
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.1.2
+		~app-text/docbook-xml-dtd-4.4
+	)
 	x11-proto/xextproto
 	x11-proto/randrproto
 	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto"
+	x11-proto/xf86miscproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} \
-		$(use_enable doc docbook-docs) \
-		$(use_enable debug) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_enable pam) \
-		$(use_enable xinerama) \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-gdm-config=/usr/share/gdm/defaults.conf \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
+	G2CONF="${G2CONF}
+		$(use_enable doc docbook-docs)
+		$(use_enable debug)
+		$(use_with libnotify)
+		$(use_with opengl libgl)
+		$(use_enable pam)
+		$(use_enable xinerama)
+		--enable-locking
+		--with-xf86gamma-ext
+		--with-kbd-layout-indicator
+		--with-gdm-config=/usr/share/gdm/defaults.conf
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
 		--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
 }
 
@@ -68,12 +68,12 @@ 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