New version for GNOME 2.26. Get idle time from xorg and idle detection from gnome-session. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 21 insertions, 119 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 5acabe17883b..481675224ed0 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.96 2009/04/27 14:25:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.97 2009/05/11 22:59:46 eva Exp $
+
+*gnome-screensaver-2.26.1 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-screensaver-2.22.2.ebuild, -gnome-screensaver-2.24.1.ebuild,
+  +gnome-screensaver-2.26.1.ebuild:
+  New version for GNOME 2.26. Get idle time from xorg and idle detection
+  from gnome-session. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gnome-screensaver-2.24.1-r1:
   Stable for HPPA (bug #260063).
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild
deleted file mode 100644
index 53f84af63ca8..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.22.2.ebuild,v 1.9 2008/11/30 12:10:01 eva Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-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/libglade-2.5.0
-	>=gnome-base/gnome-menus-2.12
-	>=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 )
-	pam? ( virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	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
-	)
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	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-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"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix bug #201019
-	epatch "${FILESDIR}/${PN}-2.20.0-fix-gamma.patch"
-
-	# Fix compatibility with gtk+-2.14
-	epatch "${FILESDIR}/${P}-fix-copy-themes-include.patch"
-}
-
-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"
-
-	# Conversion information
-	sed -e "s:\${PF}:${PF}:" \
-		< "${FILESDIR}/xss-conversion-2.txt" > "${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
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/gnome-screensaver-dialog
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate Screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-	fi
-	echo
-	elog "Information for converting screensavers is located in "
-	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
-}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1.ebuild
index 847113f2888a..fae3283f4ab4 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.24.1.ebuild,v 1.2 2008/11/30 12:10:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1.ebuild,v 1.1 2009/05/11 22:59:46 eva Exp $
 
-inherit eutils gnome2
+inherit eutils gnome2 multilib
 
 DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
 HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
@@ -33,12 +33,11 @@ RDEPEND=">=gnome-base/gconf-2.6.1
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.40
 	doc? (
 		app-text/xmlto
 		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4
-	)
+		~app-text/docbook-xml-dtd-4.4 )
 	x11-proto/xextproto
 	x11-proto/randrproto
 	x11-proto/scrnsaverproto
@@ -57,7 +56,7 @@ pkg_setup() {
 		--with-xf86gamma-ext
 		--with-kbd-layout-indicator
 		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver"
 }
 
 src_install() {
@@ -85,6 +84,12 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
 	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
 		ewarn "You have xscreensaver installed, you probably want to disable it."
 		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"