Remove NotShowIn=GNOME; and use xscreensaver.xpm for unique appearance in desktop entry. Split -5.04-gentoo.patch into separate patches. Add directory for cracklib-words. Fix bug with Xinerama wrt bug #219172.

(Portage version: 2.1.5_rc6)

11 files changed, 272 insertions, 160 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index f19c575c4e69..0019bdef9193 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.232 2008/04/02 17:48:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.233 2008/05/07 19:03:33 drac Exp $
+
+*xscreensaver-5.05-r1 (07 May 2008)
+
+  07 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/5.05/01_all_default_settings.patch,
+  +files/5.05/03_all_desktop_entry.patch,
+  +files/5.05/05_all_offensive.patch,
+  +files/5.05/02_all_cracklib_words.patch,
+  +files/5.05/04_all_posix_head.patch, +files/5.05/06_all_rpm.patch,
+  +files/5.05/07_all_xinerama.patch, +xscreensaver-5.05-r1.ebuild:
+  Remove NotShowIn=GNOME; and use xscreensaver.xpm for unique appearance in
+  desktop entry. Split -5.04-gentoo.patch into separate patches. Add
+  directory for cracklib-words. Fix bug with Xinerama wrt bug #219172.
 
   02 Apr 2008; Raúl Porcel <armin76@gentoo.org> xscreensaver-5.05.ebuild:
   ia64 stable
diff --git a/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch b/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch
new file mode 100644
index 000000000000..6d9464fbe2f9
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.05/01_all_default_settings.patch
@@ -0,0 +1,65 @@
+diff -ur xscreensaver-5.05.orig/driver/XScreenSaver.ad.in xscreensaver-5.05/driver/XScreenSaver.ad.in
+--- xscreensaver-5.05.orig/driver/XScreenSaver.ad.in	2008-03-01 23:33:47.000000000 +0200
++++ xscreensaver-5.05/driver/XScreenSaver.ad.in	2008-05-07 20:47:16.000000000 +0300
+@@ -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 --git a/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch b/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch
new file mode 100644
index 000000000000..3d05c5ae3660
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.05/02_all_cracklib_words.patch
@@ -0,0 +1,14 @@
+diff -ur xscreensaver-5.05.orig/hacks/webcollage xscreensaver-5.05/hacks/webcollage
+--- xscreensaver-5.05.orig/hacks/webcollage	2007-11-08 05:05:23.000000000 +0200
++++ xscreensaver-5.05/hacks/webcollage	2008-05-07 20:52:08.000000000 +0300
+@@ -860,7 +860,9 @@
+ 
+ 
+ sub pick_dictionary() {
+-  my @dicts = ("/usr/dict/words",
++  my @dicts = ("/usr/share/dict/cracklib-small",
++               "/usr/share/dict/cracklib-words",
++               "/usr/dict/words",
+                "/usr/share/dict/words",
+                "/usr/share/lib/dict/words");
+   foreach my $f (@dicts) {
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch b/x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch
index f0e9b90cdd75..aef8f3835e61 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch
+++ b/x11-misc/xscreensaver/files/5.05/03_all_desktop_entry.patch
@@ -1,6 +1,6 @@
 diff -ur xscreensaver-5.05.orig/driver/Makefile.in xscreensaver-5.05/driver/Makefile.in
 --- xscreensaver-5.05.orig/driver/Makefile.in	2008-03-02 07:34:46.000000000 +0200
-+++ xscreensaver-5.05/driver/Makefile.in	2008-03-02 16:07:29.000000000 +0200
++++ xscreensaver-5.05/driver/Makefile.in	2008-05-07 20:31:30.000000000 +0300
 @@ -498,7 +498,7 @@
  	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
  		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
@@ -21,9 +21,12 @@ diff -ur xscreensaver-5.05.orig/driver/Makefile.in xscreensaver-5.05/driver/Make
          fi
 diff -ur xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in xscreensaver-5.05/driver/screensaver-properties.desktop.in
 --- xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in	2008-01-27 01:16:59.000000000 +0200
-+++ xscreensaver-5.05/driver/screensaver-properties.desktop.in	2008-03-02 16:08:00.000000000 +0200
-@@ -6,3 +6,4 @@
++++ xscreensaver-5.05/driver/screensaver-properties.desktop.in	2008-05-07 20:31:51.000000000 +0300
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Exec=xscreensaver-demo
+-Icon=xscreensaver
++Icon=/usr/share/pixmaps/xscreensaver.xpm
+ Terminal=false
+ _Name=Screensaver
  _Comment=Change screensaver properties
- Type=Application
- Categories=Settings;DesktopSettings;Security;
-+NotShowIn=GNOME;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch b/x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch
index d282e78e2e44..d282e78e2e44 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch
+++ b/x11-misc/xscreensaver/files/5.05/04_all_posix_head.patch
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch b/x11-misc/xscreensaver/files/5.05/05_all_offensive.patch
index 5c406902de8e..60ea997265ba 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch
+++ b/x11-misc/xscreensaver/files/5.05/05_all_offensive.patch
@@ -1,6 +1,6 @@
-diff -ur xscreensaver-5.04.orig/hacks/barcode.c xscreensaver-5.04/hacks/barcode.c
---- xscreensaver-5.04.orig/hacks/barcode.c	2006-04-06 09:40:32.000000000 +0300
-+++ xscreensaver-5.04/hacks/barcode.c	2008-01-01 18:21:08.000000000 +0200
+diff -ur xscreensaver-5.05.orig/hacks/barcode.c xscreensaver-5.05/hacks/barcode.c
+--- xscreensaver-5.05.orig/hacks/barcode.c	2006-04-06 09:40:32.000000000 +0300
++++ xscreensaver-5.05/hacks/barcode.c	2008-05-07 20:49:16.000000000 +0300
 @@ -131,7 +131,6 @@
    "children",
    "chocolate",
@@ -26,9 +26,9 @@ diff -ur xscreensaver-5.04.orig/hacks/barcode.c xscreensaver-5.04/hacks/barcode.
    "victim",
    "vignette",
    "villainy",
-diff -ur xscreensaver-5.04.orig/hacks/glx/glsnake.c xscreensaver-5.04/hacks/glx/glsnake.c
---- xscreensaver-5.04.orig/hacks/glx/glsnake.c	2006-05-03 22:39:21.000000000 +0300
-+++ xscreensaver-5.04/hacks/glx/glsnake.c	2008-01-01 18:18:34.000000000 +0200
+diff -ur xscreensaver-5.05.orig/hacks/glx/glsnake.c xscreensaver-5.05/hacks/glx/glsnake.c
+--- xscreensaver-5.05.orig/hacks/glx/glsnake.c	2006-05-03 22:39:21.000000000 +0300
++++ xscreensaver-5.05/hacks/glx/glsnake.c	2008-05-07 20:49:16.000000000 +0300
 @@ -565,17 +565,17 @@
  	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
  	ZERO, PIN, ZERO }
diff --git a/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch b/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch
new file mode 100644
index 000000000000..ffaf233d9d4c
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.05/06_all_rpm.patch
@@ -0,0 +1,46 @@
+diff -ur xscreensaver-5.05.orig/configure.in xscreensaver-5.05/configure.in
+--- xscreensaver-5.05.orig/configure.in	2008-03-02 00:14:30.000000000 +0200
++++ xscreensaver-5.05/configure.in	2008-05-07 20:53:26.000000000 +0300
+@@ -4169,41 +4169,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 --git a/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch b/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch
new file mode 100644
index 000000000000..b908b1d03c00
--- /dev/null
+++ b/x11-misc/xscreensaver/files/5.05/07_all_xinerama.patch
@@ -0,0 +1,12 @@
+diff -ur xscreensaver-5.05.orig/driver/xscreensaver.c xscreensaver-5.05/driver/xscreensaver.c
+--- xscreensaver-5.05.orig/driver/xscreensaver.c	2008-03-01 06:05:12.000000000 +0200
++++ xscreensaver-5.05/driver/xscreensaver.c	2008-05-07 21:03:52.000000000 +0300
+@@ -816,7 +816,7 @@
+       if (i != j &&
+           xsi[i].screen_number >= 0 &&
+           xsi[j].screen_number >= 0 &&
+-          X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (X1+H1) <= (X2+H2))
++          X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (Y1+H1) <= (Y2+H2))
+         {
+           sprintf (err, "%dx%d+%d+%d enclosed by %dx%d+%d+%d",
+                    W1, H1, X1, Y1,
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch
deleted file mode 100644
index c136e95dcd5b..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.04-gentoo.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-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.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild
new file mode 100644
index 000000000000..50caeba12a8d
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild,v 1.1 2008/05/07 19:03:33 drac Exp $
+
+inherit autotools eutils flag-o-matic multilib pam
+
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="jpeg new-login opengl pam suid xinerama"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libXxf86vm
+	x11-libs/libXrandr
+	x11-libs/libXxf86misc
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-apps/xwininfo
+	x11-apps/appres
+	media-libs/netpbm
+	>=dev-libs/libxml2-2.5
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-1.99
+	pam? ( virtual/pam )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	new-login? ( gnome-base/gdm )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/scrnsaverproto
+	x11-proto/recordproto
+	x11-proto/xf86miscproto
+	sys-devel/bc
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
+	eautoreconf # bug 113681
+}
+
+src_compile() {
+	if use ppc || use ppc64; then
+		# Still fails to build "flurry" screensaver.
+		filter-flags -mabi=altivec
+		filter-flags -maltivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS
+
+	econf \
+		--with-x-app-defaults=/usr/share/X11/app-defaults \
+		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir=/usr/share/${PN}/config \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
+		--with-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-randr-ext \
+		--with-proc-interrupts \
+		--with-xpm \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		--without-kerberos \
+		--without-gle \
+		--with-gtk \
+		$(use_with suid setuid-hacks) \
+		$(use_with new-login login-manager) \
+		$(use_with xinerama xinerama-ext) \
+		$(use_with pam) \
+		$(use_with opengl gl) \
+		$(use_with jpeg)
+
+	emake -j1 || die "emake failed." # bug 155049
+}
+
+src_install() {
+	emake install_prefix="${D}" install || die "emake install failed."
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	# bug 135549
+	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+	dodir /usr/share/man/man6x
+	mv "${D}"/usr/share/man/man6/worm.6 \
+		"${D}"/usr/share/man/man6x/worm.6x
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.05.ebuild b/x11-misc/xscreensaver/xscreensaver-5.05.ebuild
index 3f3c6d630489..e8c9049bba14 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.05.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.10 2008/04/20 02:30:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.11 2008/05/07 19:03:33 drac Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -40,12 +40,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# phew, posted everything to upstream so lets
-	# see what version 5.06 brings us..
-	epatch "${FILESDIR}"/${PN}-5.04-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-5.04-nsfw.patch
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-	epatch "${FILESDIR}"/${P}-posix-head.patch
+	EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="07_all_xinerama.patch" epatch	"${FILESDIR}"/${PV}
 	eautoreconf # bug 113681
 }