Revision bump to test a patch for bug #113951.

(Portage version: 2.1_pre4-r1)

5 files changed, 254 insertions, 11 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 51d76489a6b4..88753ae37076 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.130 2006/02/09 22:31:14 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.131 2006/02/11 12:38:41 nelchael Exp $
+
+*xscreensaver-4.23-r2 (11 Feb 2006)
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xscreensaver-4.23-dpms.patch, +xscreensaver-4.23-r2.ebuild:
+  Revision bump to revert changes made to DPMS code that cause some artifacts
+  to apear, see bug #113951.
 
 *xscreensaver-4.23-r1 (07 Feb 2006)
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 7e710c9daf30..23e54b960816 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9386ae13eb6a69e5309112ce6dc8dec3 ChangeLog 21730
 RMD160 70e1eeb21689830a89d802a945571bf71d7463a3 ChangeLog 21730
 SHA256 05f3d0e2c4d2643a1a020069ef61bd7c3b6ab20f5ba473141c4fcf5910da9b9d ChangeLog 21730
@@ -13,6 +10,9 @@ SHA256 b6bef3cbc05ebbeedf4b2fdf7fd81440b6ed400aed2705da47504564403451fc files/di
 MD5 2dec78c3103e6a62dbcace7dc2d16bf1 files/digest-xscreensaver-4.23-r1 256
 RMD160 b205bfc06fbb52feebef73a04f8771a1d37e9f58 files/digest-xscreensaver-4.23-r1 256
 SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/digest-xscreensaver-4.23-r1 256
+MD5 2dec78c3103e6a62dbcace7dc2d16bf1 files/digest-xscreensaver-4.23-r2 256
+RMD160 b205bfc06fbb52feebef73a04f8771a1d37e9f58 files/digest-xscreensaver-4.23-r2 256
+SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/digest-xscreensaver-4.23-r2 256
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
 RMD160 6d51280f7ad5626c93f43ce2ee2d80b691971990 files/pam.d/xscreensaver 79
 SHA256 53f0ebf0d9c8442c2f513a9a2b8faab71992df4b3475fd1a592f43a0a7dff0c3 files/pam.d/xscreensaver 79
@@ -40,6 +40,9 @@ SHA256 f4c3229eca0ab9b055f1970c66fcb4488ef8f5095d57f0ce11e193a88380dae4 files/xs
 MD5 bd61d24250fdc129cf9b86e154c8c27a files/xscreensaver-4.23-app-defaults.patch 1080
 RMD160 76ef9f99d5f8479621fc4c7a2ea62dad96173804 files/xscreensaver-4.23-app-defaults.patch 1080
 SHA256 02b36425c8c1adda652995ea168db054df7e7cdc78e9a520df47914f2213f95c files/xscreensaver-4.23-app-defaults.patch 1080
+MD5 c6c145b1dd09ca7acf17509a78c1293d files/xscreensaver-4.23-dpms.patch 1800
+RMD160 d9b15e9244b2c28290ff002d352e068a13636d4f files/xscreensaver-4.23-dpms.patch 1800
+SHA256 42ac4a8e2760a5a781e2a069440ada3e7477cbc737d8166034a5775e8ab1fd05 files/xscreensaver-4.23-dpms.patch 1800
 MD5 0ed894eebbc461f9523539a8d273535e files/xscreensaver-4.23-norpm.patch 1775
 RMD160 57cdbe407659219da8a66b59f22695d621f1e338 files/xscreensaver-4.23-norpm.patch 1775
 SHA256 bae37d855e92d48a69e472e450a7aae479e821c45ec05bc91a01a9efe3ef59e4 files/xscreensaver-4.23-norpm.patch 1775
@@ -61,10 +64,6 @@ SHA256 0f7e8846e649507ce432f7dd41537c97a525acbc1749ced6c8b837157f5848e0 xscreens
 MD5 53d146b9c08a5eedc8babd5814a7bc10 xscreensaver-4.23-r1.ebuild 5468
 RMD160 0978ea7d08be4363144746268089c2d4b0f83fba xscreensaver-4.23-r1.ebuild 5468
 SHA256 988ef558e18e69338dd9738665dc46bf49fed5da4d55a2c3fd6557d3a15f9f16 xscreensaver-4.23-r1.ebuild 5468
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD68K+V3J2n04EauwRAkONAJ46QwHS3gzIBXednlBn5LUTEibS2wCcCLrT
-nGKm9qSLkSFPLFE0aXHLFNI=
-=SQRa
------END PGP SIGNATURE-----
+MD5 44074d0bb28b2e5d67e8d8abf4d957f4 xscreensaver-4.23-r2.ebuild 5508
+RMD160 f2e8c47fe5227b390de329b5d385b1156252b72a xscreensaver-4.23-r2.ebuild 5508
+SHA256 9f569f00f067670328f44b49e1e2db070c0724b965e011680a54516456a4fdba xscreensaver-4.23-r2.ebuild 5508
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2
new file mode 100644
index 000000000000..53fe2665124c
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2
@@ -0,0 +1,3 @@
+MD5 27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz 4939070
+RMD160 b18c2e45fca132e017bd24e6e8fca91154fa03db xscreensaver-4.23.tar.gz 4939070
+SHA256 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7 xscreensaver-4.23.tar.gz 4939070
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch
new file mode 100644
index 000000000000..a01bb34f6f21
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch
@@ -0,0 +1,42 @@
+diff -Nru xscreensaver-4.23.vanilla/driver/prefs.c xscreensaver-4.23/driver/prefs.c
+--- xscreensaver-4.23.vanilla/driver/prefs.c	2006-02-11 13:29:49.000000000 +0100
++++ xscreensaver-4.23/driver/prefs.c	2006-02-11 13:31:13.000000000 +0100
+@@ -1583,15 +1583,11 @@
+       p->dpms_off < 10 * 1000)
+     p->dpms_off      = 4 * 60 * 60 * 1000;			 /* 4 hours */
+ 
+-  /* suspend may not be greater than off, unless off is 0.
+-     standby may not be greater than suspend, unless suspend is 0.
++  /* standby may not be greater than suspend.
++     suspend may not be greater than off.
+    */
+-  if (p->dpms_off != 0 &&
+-      p->dpms_suspend > p->dpms_off)
+-    p->dpms_suspend = p->dpms_off;
+-  if (p->dpms_suspend != 0 &&
+-      p->dpms_standby > p->dpms_suspend)
+-    p->dpms_standby = p->dpms_suspend;
++  if (p->dpms_standby > p->dpms_suspend) p->dpms_standby = p->dpms_suspend;
++  if (p->dpms_suspend > p->dpms_off)     p->dpms_suspend = p->dpms_off;
+ 
+ 
+   if (p->dpms_standby == 0 &&	   /* if *all* are 0, then DPMS is disabled */
+diff -Nru xscreensaver-4.23.vanilla/driver/timers.c xscreensaver-4.23/driver/timers.c
+--- xscreensaver-4.23.vanilla/driver/timers.c	2006-02-11 13:29:49.000000000 +0100
++++ xscreensaver-4.23/driver/timers.c	2006-02-11 13:31:56.000000000 +0100
+@@ -332,15 +332,6 @@
+ 
+   si->last_activity_time = time ((time_t *) 0);
+ 
+-  /* This will (hopefully, supposedly) tell the server to re-set its
+-     DPMS timer.  Without this, the -deactivate clientmessage would
+-     prevent xscreensaver from blanking, but would not prevent the
+-     monitor from powering down. */
+-  XForceScreenSaver (si->dpy, ScreenSaverReset);
+-
+-  /* And if the monitor is already powered off, turn it on.
+-     You'd think the above would do that, but apparently not? */
+-  monitor_power_on (si);
+ }
+ 
+ 
diff --git a/x11-misc/xscreensaver/xscreensaver-4.23-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.23-r2.ebuild
new file mode 100644
index 000000000000..e8a360fc37fc
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.23-r2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23-r2.ebuild,v 1.1 2006/02/11 12:38:41 nelchael Exp $
+
+inherit eutils flag-o-matic pam fixheadtails autotools
+
+IUSE="gnome jpeg kerberos krb4 insecure-savers new-login nls offensive opengl pam xinerama"
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+
+LICENSE="BSD"
+KEYWORDS="-*"
+SLOT="0"
+
+RDEPEND="|| ( (
+		x11-libs/libXxf86misc
+		x11-apps/xwininfo
+		xinerama? ( x11-libs/libXinerama ) )
+	virtual/x11 )
+	media-libs/netpbm
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/libxml2-2.5
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-1.99
+	>=dev-libs/glib-2
+	pam? ( virtual/pam )
+	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl
+	          >=media-libs/gle-3.0.1 )
+	!arm? ( new-login? ( gnome-base/gdm ) )"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xf86vidmodeproto
+		x11-proto/xextproto
+		x11-proto/scrnsaverproto
+		x11-proto/recordproto
+		x11-proto/xf86miscproto
+		xinerama? ( x11-proto/xineramaproto ) )
+	virtual/x11 )
+	sys-devel/bc
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+# simple workaround for the flurry screensaver
+filter-flags -mabi=altivec
+filter-flags -maltivec
+append-flags -U__VEC__
+
+pkg_setup() {
+	if use kerberos && ! use krb4 ; then
+		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
+		ewarn "disabled unless kerberos 4 support has been compiled with your"
+		ewarn "kerberos libraries. To do that, you should abort now and do:"
+		ewarn
+		ewarn " USE=\"krb4\" emerge mit-krb5"
+		ewarn
+		epause
+	fi
+	if use arm && use new-login; then
+		ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
+		ewarn "available for the arm platform. please disable this use flag"
+		die "new-login USE is not supported on arm"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
+	# use gnome-terminal in tests rather than gnome-open (bug #94708)
+	# and bug 118028:
+	epatch "${FILESDIR}/${P}-norpm.patch"
+
+	# tweaks the default configuration (driver/XScreenSaver.ad.in)
+	epatch ${FILESDIR}/${PN}-4.22-settings.patch
+
+	# makes the blank screen REALLY blank
+	epatch ${FILESDIR}/${PN}-blank-screen.patch
+
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch ${FILESDIR}/${P}-nsfw.patch
+
+	# If offensive is set patch webcollage to work:
+	use offensive && epatch ${FILESDIR}/${P}-words.patch
+
+	# Fix for modular X:
+	epatch "${FILESDIR}/${P}-app-defaults.patch"
+	eautoreconf
+
+	# Experimental patch that should fix bug #113951:
+	epatch "${FILESDIR}/${P}-dpms.patch"
+
+	# change old head/tail to POSIX ones
+	ht_fix_all
+}
+
+src_compile() {
+	local myconf
+	use kerberos && use krb4 \
+		&& myconf="${myconf} --with-kerberos" \
+		|| myconf="${myconf} --without-kerberos"
+
+	unset BC_ENV_ARGS
+	econf \
+		--with-hackdir=/usr/lib/misc/xscreensaver \
+		--with-configdir=/usr/share/xscreensaver/config \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
+		--with-mit-ext \
+		--with-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-proc-interrupts \
+		--with-xpm \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		--with-gtk \
+		--with-xml \
+		$(use_with insecure-savers setuid-hacks) \
+		$(use_with new-login login-manager) \
+		$(use_with xinerama xinerama-ext) \
+		$(use_with pam) \
+		$(use_with opengl gl) $(use_with opengl gle) \
+		$(use_with jpeg) \
+		$(use_enable nls) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
+
+	make install_prefix="${D}" install || die "make install failed"
+
+	dodoc README
+
+	# install correctly in gnome, including info about configuration preferences
+	if use gnome ; then
+		dodir /usr/share/gnome/capplets
+		insinto /usr/share/gnome/capplets
+		doins driver/screensaver-properties.desktop
+
+		dodir /usr/share/pixmaps
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm
+		xscreensaver.xpm
+
+		dodir /usr/share/control-center-2.0/capplets
+		insinto /usr/share/control-center-2.0/capplets
+		newins ${FILESDIR}/desktop_entries/screensaver-properties.desktop
+	fi
+
+	# Remove "extra" capplet
+	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
+
+	use pam && fperms 755 /usr/bin/xscreensaver
+	pamd_mimic_system xscreensaver auth
+}
+
+pkg_postinst() {
+	if ! use new-login; then
+		einfo
+		einfo "You have chosen to not use the new-login USE flag."
+		einfo "This is a new USE flag which enables individuals to"
+		einfo "create new logins when the screensaver is active,"
+		einfo "allowing others to use their account, even though the"
+		einfo "screen is locked to another account. If you want this"
+		einfo "feature, please recompile with USE=\"new-login\"."
+		einfo
+	fi
+
+	if use insecure-savers;then
+		ewarn
+		ewarn "You have chosen USE=insecure-savers. While upstream"
+		ewarn "has made every effort to make sure these savers do not"
+		ewarn "abuse their setuid root status, the possibilty exists that"
+		ewarn "someone will exploit xscreensaver and will be able to gain"
+		ewarn "root privledges. You have been warned."
+		ewarn
+	fi
+
+	einfo
+	einfo "The gtk USE flag has been dropped. gtk is now required for Gentoo's"
+	einfo "xscreensaver. If this is a problem, bug upstream."
+	einfo
+}