Update patch. Sort ebuild.

(Portage version: 2.1.4_rc11)

3 files changed, 157 insertions, 12 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 080f56310d0d..aa524b1ecdea 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.205 2007/12/30 19:39:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.206 2007/12/30 20:06:21 drac Exp $
+
+  30 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xscreensaver-5.04-gentoo.patch, xscreensaver-5.04.ebuild:
+  Update patch. Sort ebuild.
 
 *xscreensaver-5.04 (30 Dec 2007)
 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch
new file mode 100644
index 000000000000..c136e95dcd5b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch
@@ -0,0 +1,140 @@
+diff -ur xscreensaver-5.04.orig/configure.in xscreensaver-5.04/configure.in
+--- xscreensaver-5.04.orig/configure.in	2007-11-11 03:00:31.000000000 +0200
++++ xscreensaver-5.04/configure.in	2007-12-30 21:46:13.000000000 +0200
+@@ -4145,41 +4145,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
+diff -ur xscreensaver-5.04.orig/driver/XScreenSaver.ad.in xscreensaver-5.04/driver/XScreenSaver.ad.in
+--- xscreensaver-5.04.orig/driver/XScreenSaver.ad.in	2007-11-13 10:36:00.000000000 +0200
++++ xscreensaver-5.04/driver/XScreenSaver.ad.in	2007-12-30 21:46:13.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 -ur xscreensaver-5.04.orig/driver/xscreensaver.c xscreensaver-5.04/driver/xscreensaver.c
+--- xscreensaver-5.04.orig/driver/xscreensaver.c	2007-11-11 23:11:59.000000000 +0200
++++ xscreensaver-5.04/driver/xscreensaver.c	2007-12-30 21:46:13.000000000 +0200
+@@ -1644,10 +1644,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 -ur xscreensaver-5.04.orig/hacks/webcollage xscreensaver-5.04/hacks/webcollage
+--- xscreensaver-5.04.orig/hacks/webcollage	2007-11-08 05:05:23.000000000 +0200
++++ xscreensaver-5.04/hacks/webcollage	2007-12-30 21:46:13.000000000 +0200
+@@ -860,7 +860,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.04.ebuild b/x11-misc/xscreensaver/xscreensaver-5.04.ebuild
index 5264f063c7e0..5d1e41f3e994 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.04.ebuild
@@ -1,8 +1,8 @@
 # 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.04.ebuild,v 1.1 2007/12/30 19:39:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04.ebuild,v 1.2 2007/12/30 20:06:21 drac Exp $
 
-inherit eutils flag-o-matic pam fixheadtails autotools
+inherit autotools eutils fixheadtails flag-o-matic pam
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -43,27 +43,28 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-5.02-gentoo.patch
+	# Gentoo specific hacks and settings.
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	use offensive || epatch "${FILESDIR}"/${P}-nsfw.patch
 
-	# Update spec. using desktop-file-validate.
+	# TODO. Get this fixed upstream.
 	epatch "${FILESDIR}"/${P}-desktop-entry.patch
 
-	# disable offensive screensavers.
-	use offensive || epatch "${FILESDIR}"/${P}-nsfw.patch
-
 	eautoreconf
 
-	# change head and tail calls to POSIX ones.
+	# TODO. Get this fixed upstream.
 	ht_fix_all
 }
 
 src_compile() {
-	# simple workaround for the flurry screensaver
+	# Simple workaround for the flurry screensaver.
+	# TODO. Figure out if this is still needed?
 	filter-flags -mabi=altivec
 	filter-flags -maltivec
 	append-flags -U__VEC__
 
 	unset BC_ENV_ARGS
+
 	econf \
 		--with-x-app-defaults=/usr/share/X11/app-defaults \
 		--with-hackdir=/usr/lib/misc/xscreensaver \
@@ -88,7 +89,7 @@ src_compile() {
 		$(use_with opengl gl) \
 		$(use_with jpeg)
 
-	# Fix bug 155049.
+	# Bug 155049.
 	emake -j1 || die "emake failed."
 }
 
@@ -100,7 +101,7 @@ src_install() {
 	use pam && fperms 755 /usr/bin/xscreensaver
 	pamd_mimic_system xscreensaver auth
 
-	# Fix bug #135549.
+	# Bug 135549.
 	rm -f "${D}"/usr/share/xscreensaver/config/electricsheep.xml
 	rm -f "${D}"/usr/share/xscreensaver/config/fireflies.xml
 	dodir /usr/share/man/man6x