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

(Portage version: 2.1.2.9)

3 files changed, 171 insertions, 13 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/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() {