Stop using invalid patch hidden inside combined xscreensaver-5.01-gentoo.patch after consulting upstream.

Package-Manager: portage-2.1.2.9

4 files changed, 183 insertions, 21 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 62e7e7885d5d..e805b9ee2643 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.187 2007/06/13 18:44:46 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.188 2007/06/13 20:40:15 drac Exp $
+
+  13 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xscreensaver-5.02-gentoo.patch, xscreensaver-5.02-r2.ebuild:
+  Stop using invalid patch hidden inside combined
+  xscreensaver-5.01-gentoo.patch after consulting upstream.
 
   13 Jun 2007; Samuli Suominen <drac@gentoo.org> xscreensaver-5.02.ebuild,
   xscreensaver-5.02-r1.ebuild, xscreensaver-5.02-r2.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 3eaf408aae4e..6110c2fa832e 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -18,6 +18,10 @@ AUX xscreensaver-5.02-gdmflexiserver.patch 502 RMD160 0464f2947b45a35fa5637b2a2a
 MD5 bd96031a45071588407c6a224ba35fd1 files/xscreensaver-5.02-gdmflexiserver.patch 502
 RMD160 0464f2947b45a35fa5637b2a2a9844643ee0abd5 files/xscreensaver-5.02-gdmflexiserver.patch 502
 SHA256 be09476349915072b2ebf6343aff9557b556a90bcb599b63e1f90ce1a85c58ae files/xscreensaver-5.02-gdmflexiserver.patch 502
+AUX xscreensaver-5.02-gentoo.patch 5731 RMD160 01d82a320dfcddfa0b5870c395d2334dc49e8af4 SHA1 8f3a08256907d0fe45eb75140843c9db8db3de88 SHA256 a5055ebfd350d236daa6625700dfdf1e638aea90f5472a3d700020c3ea303d73
+MD5 ab024a914f004a958a01c6f61be3f3c9 files/xscreensaver-5.02-gentoo.patch 5731
+RMD160 01d82a320dfcddfa0b5870c395d2334dc49e8af4 files/xscreensaver-5.02-gentoo.patch 5731
+SHA256 a5055ebfd350d236daa6625700dfdf1e638aea90f5472a3d700020c3ea303d73 files/xscreensaver-5.02-gentoo.patch 5731
 AUX xscreensaver-5.02-nsfw.patch 7020 RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 SHA1 25060506a26d6e406622fcc38b6c7899e662b0e8 SHA256 27d5893ac5a123d33c1029c4cd5e2690212562c2b4113c3b9c1d39c34210ff40
 MD5 2ff74ddf7eaa13452ded84caeed509f6 files/xscreensaver-5.02-nsfw.patch 7020
 RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 files/xscreensaver-5.02-nsfw.patch 7020
@@ -36,18 +40,18 @@ EBUILD xscreensaver-5.02-r1.ebuild 4572 RMD160 39b2de5bb79b060353ac12399c6a2219b
 MD5 63d019e2a96b0f5e2d599ea821baf36c xscreensaver-5.02-r1.ebuild 4572
 RMD160 39b2de5bb79b060353ac12399c6a2219b15da9df xscreensaver-5.02-r1.ebuild 4572
 SHA256 961900e8a5eaeff16c54014a5788ffd6db1043c0e665d8da9a2de562611654c1 xscreensaver-5.02-r1.ebuild 4572
-EBUILD xscreensaver-5.02-r2.ebuild 4650 RMD160 47ffcf64f394f88ef3e5cb9612568b72f8fee95d SHA1 60170879061d7bb9394095f05a9a917f027bcf07 SHA256 cb2bf098f6fc040752325cecdc46eb81a00f8b2b5bc2170c3274219cb4687fd0
-MD5 b9ce935d57c1a1b6cceb68ace3ba955e xscreensaver-5.02-r2.ebuild 4650
-RMD160 47ffcf64f394f88ef3e5cb9612568b72f8fee95d xscreensaver-5.02-r2.ebuild 4650
-SHA256 cb2bf098f6fc040752325cecdc46eb81a00f8b2b5bc2170c3274219cb4687fd0 xscreensaver-5.02-r2.ebuild 4650
+EBUILD xscreensaver-5.02-r2.ebuild 4559 RMD160 b11eadd6259fdcec4f4928ed34fb1a00a2a40c81 SHA1 f23b9f9c294f002ada9695e05d44f150299b284a SHA256 0a1603c07eea0596a14a410e91961bab7c6968ba9225acca2cfa4982f6e18adf
+MD5 e676bf17efc02a2a70f31f5d27aa2650 xscreensaver-5.02-r2.ebuild 4559
+RMD160 b11eadd6259fdcec4f4928ed34fb1a00a2a40c81 xscreensaver-5.02-r2.ebuild 4559
+SHA256 0a1603c07eea0596a14a410e91961bab7c6968ba9225acca2cfa4982f6e18adf xscreensaver-5.02-r2.ebuild 4559
 EBUILD xscreensaver-5.02.ebuild 4515 RMD160 d7082d9644102390e5a33bde445185084b1c6bdf SHA1 f14594ec10f3c78687764b845481ada7ab2de48f SHA256 94d629e5f4c1c67528ac66f2f716d65817deda44d44d59e2b2d5dc186f8f5c6a
 MD5 c15604350570c11f85c114e7dd7810d8 xscreensaver-5.02.ebuild 4515
 RMD160 d7082d9644102390e5a33bde445185084b1c6bdf xscreensaver-5.02.ebuild 4515
 SHA256 94d629e5f4c1c67528ac66f2f716d65817deda44d44d59e2b2d5dc186f8f5c6a xscreensaver-5.02.ebuild 4515
-MISC ChangeLog 31159 RMD160 29bd8b29008af74e5944810c86cf452c4de51c6b SHA1 bada1a53a58dab62fee612e8765c82f1a0b165cd SHA256 1c48878f8494fe33be5a286e6764498e1aa900587a310a78207e2d1480585474
-MD5 7bf506bb4a7c296066b41db576213b21 ChangeLog 31159
-RMD160 29bd8b29008af74e5944810c86cf452c4de51c6b ChangeLog 31159
-SHA256 1c48878f8494fe33be5a286e6764498e1aa900587a310a78207e2d1480585474 ChangeLog 31159
+MISC ChangeLog 31389 RMD160 0cce133310c963c9ca243831efa540777d3b8e07 SHA1 0058a28d999dfe5724f67ee022f54f9f7d414b57 SHA256 3c7d76c533bd11f3c8f259b9a3381a7281d96f909b653c6303de5562c330cf56
+MD5 3484cc9a0a93f1ed57ed9f731eb01334 ChangeLog 31389
+RMD160 0cce133310c963c9ca243831efa540777d3b8e07 ChangeLog 31389
+SHA256 3c7d76c533bd11f3c8f259b9a3381a7281d96f909b653c6303de5562c330cf56 ChangeLog 31389
 MISC metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 SHA1 debca11d5df5829ba86249140fdb4f4a42d3103c SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360
 MD5 44efda022b0c02da6c8b2096905feae9 metadata.xml 387
 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 metadata.xml 387
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-gentoo.patch
new file mode 100644
index 000000000000..f54cbf3c1c06
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.02-gentoo.patch
@@ -0,0 +1,158 @@
+diff -ru xscreensaver-5.01.vanilla/configure.in xscreensaver-5.01/configure.in
+--- xscreensaver-5.01.vanilla/configure.in	2006-10-11 14:31:26.000000000 +0200
++++ xscreensaver-5.01/configure.in	2006-10-11 14:32:01.000000000 +0200
+@@ -724,6 +724,8 @@
+   # Look for the directory under a standard set of common directories.
+   # Check X11 before X11Rn because it's often a symlink to the current release.
+   for ac_dir in                                 \
++    /usr/lib/X11/app-defaults                   \
++                                                \
+     /usr/X11/lib/app-defaults                   \
+     /usr/X11R6/lib/app-defaults                 \
+     /usr/X11R6/lib/X11/app-defaults             \
+@@ -754,7 +756,6 @@
+     /usr/x386/lib/X11/app-defaults              \
+     /usr/XFree86/lib/X11/app-defaults           \
+                                                 \
+-    /usr/lib/X11/app-defaults                   \
+     /usr/local/lib/X11/app-defaults             \
+     /usr/unsupported/lib/X11/app-defaults       \
+     /usr/athena/lib/X11/app-defaults            \
+@@ -4142,41 +4143,7 @@
+ # Now let's warn if there's a previous RPM version already installed.
+ # But don't bother with this test if we are currently *building* an RPM.
+ 
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+-
+-  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
+-
+-  # M4 sucks!!
+-  changequote(X,Y)
+-  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
+-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
+-        head -1`
+-  changequote([,])
+-
+-  if test \! -z "$rpmv" ; then
+-    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
+-    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'`
+-
+-    warning=no
+-    warnL "There is already an installed RPM of xscreensaver $rpmv"
+-    warn2 'on this system.  You might want to remove it ("rpm -ve")'
+-    warn2 'before running "make install" in this directory.'
+-    echo ""
+-    warn2 "Alternately, you could build this version of xscreensaver"
+-    warn2 'as an RPM, and then install that.  An "xscreensaver.spec"'
+-    warn2 'file is included.  Try "rpmbuild -v -ba xscreensaver.spec".'
+-    warn2 "See the RPM documentation for more info."
+-    echo ""
+-
+-    if test "$rpmbdir" = "$rpmhdir" ; then
+-      warn2 "The RPM version was installed in $rpmbdir/."
+-      do_dir_warning=yes
+-    else
+-      warn2 "The RPM version was installed in $rpmbdir/,"
+-      warn2 "with demos in $rpmhdir/."
+-    fi
+-  fi
+-fi
++# Nope - breaks compilation with sandbox violation
+ 
+ if test "${bindir}" = "${HACKDIR}" ; then
+   do_dir_warning=yes
+Only in xscreensaver-5.01: configure.in.orig
+diff -ru xscreensaver-5.01.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.01/driver/XScreenSaver.ad.in
+--- xscreensaver-5.01.vanilla/driver/XScreenSaver.ad.in	2006-10-11 14:31:26.000000000 +0200
++++ xscreensaver-5.01/driver/XScreenSaver.ad.in	2006-10-11 14:32:01.000000000 +0200
+@@ -31,36 +31,36 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:20:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
+-*dpmsStandby:		2:00:00
+-*dpmsSuspend:		2:00:00
+-*dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*dpmsEnabled:		True
++*dpmsStandby:		1:00:00
++*dpmsSuspend:		1:00:00
++*dpmsOff:		2:00:00
++*grabDesktopImages:	False
+ *grabVideoFrames:	False
+ *chooseRandomImages:	@DEFAULT_IMAGES_P@
+ *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
+ *nice:			10
+ *memoryLimit:		0
+-*lock:			False
++*lock:			True
+ *verbose:		False
+ *timestamp:		True
+ *fade:			True
+ *unfade:		False
+ *fadeSeconds:		0:00:03
+ *fadeTicks:		20
+-*splash:		True
++*splash:		False
+ *splashDuration:	0:00:05
+ *visualID:		default
+ *captureStderr: 	True
+ *ignoreUninstalledPrograms: False
+ 
+-*textMode:		file
+-*textLiteral:		XScreenSaver
+-*textFile:		@DEFAULT_TEXT_FILE@
+-*textProgram:		fortune
+-*textURL:		http://www.livejournal.com/stats/latest-rss.bml
++*textMode:		literal
++*textLiteral:		Gentoo Linux
++*textFile:		/etc/gentoo-release
++*textProgram:		/usr/bin/fortune
++*textURL:		http://planet.gentoo.org/rss20.xml
+ 
+ *overlayTextForeground:	#FFFF00
+ *overlayTextBackground:	#000000
+@@ -117,7 +117,10 @@
+ 
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat:		%d-%b-%y (%a); %I:%M %p
++! Preferred time representation for the current locale
++*dateFormat:    %x %X
++! Xscreensaver's default
++! *dateFormat:		%d-%b-%y (%a); %I:%M %p
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:
+diff -ru xscreensaver-5.01.vanilla/driver/xscreensaver.c xscreensaver-5.01/driver/xscreensaver.c
+--- xscreensaver-5.01.vanilla/driver/xscreensaver.c	2006-10-11 14:31:26.000000000 +0200
++++ xscreensaver-5.01/driver/xscreensaver.c	2006-10-11 14:32:01.000000000 +0200
+@@ -1626,10 +1626,12 @@
+       if (hint.res_class) XFree (hint.res_class);
+     }
+ 
++  /*
+   fprintf (stderr, "%s: %d: unrecognised ClientMessage \"%s\" received\n",
+            blurb(), screen, (str ? str : "(null)"));
+   fprintf (stderr, "%s: %d: for window 0x%lx (%s)\n",
+            blurb(), screen, (unsigned long) w, wdesc);
++		   */
+   if (str) XFree (str);
+ }
+ 
+diff -ru xscreensaver-5.01.vanilla/hacks/webcollage xscreensaver-5.01/hacks/webcollage
+--- xscreensaver-5.01.vanilla/hacks/webcollage	2006-10-11 14:31:26.000000000 +0200
++++ xscreensaver-5.01/hacks/webcollage	2006-10-11 14:32:01.000000000 +0200
+@@ -845,7 +845,8 @@
+ 
+ 
+ sub pick_dictionary() {
+-  my @dicts = ("/usr/dict/words",
++  my @dicts = ("/usr/share/dict/cracklib-small",
++               "/usr/dict/words",
+                "/usr/share/dict/words",
+                "/usr/share/lib/dict/words");
+   foreach my $f (@dicts) {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
index d893740650d6..49ad6f26462d 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02-r2.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/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild,v 1.3 2007/06/13 18:44:46 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild,v 1.4 2007/06/13 20:40:15 drac Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -43,22 +43,17 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Bug fixes:
-	epatch "${FILESDIR}/${PN}-5.01-gentoo.patch"
-
-	# disable not-safe-for-work xscreensavers
-	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
-
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-gdmflexiserver.patch
-
-	# bug 180542. fix for segmentation fault with non-interactive pam.
 	epatch "${FILESDIR}"/${P}-pam.patch
 
-	eautoreconf
+	# disable offensive screensavers.
+	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
 
-	# change old head/tail to POSIX ones
+	eautoreconf
+	
+	# change head and tail calls to POSIX ones.
 	ht_fix_all
-
 }
 
 src_compile() {