Version bump, see bug #135210. This version has changed API, all third party screen savers will not work until ported to the new API by upstream.

Package-Manager: portage-2.1_rc4-r1

6 files changed, 537 insertions, 5 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index ae16c2cd1ad4..7b2c6db13e32 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.137 2006/05/24 21:03:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.138 2006/06/04 10:01:47 nelchael Exp $
+
+*xscreensaver-5.00 (04 Jun 2006)
+
+  04 Jun 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xscreensaver-5.00-gentoo.patch,
+  +files/xscreensaver-5.00-nsfw.patch, +xscreensaver-5.00.ebuild:
+  Version bump, see bug #135210. This version has changed API, all third party
+  screen savers will not work until ported to the new API by upstream.
 
   24 May 2006; Michael Hanselmann <hansmi@gentoo.org>
   xscreensaver-4.24.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 4d0538abf180..6f7ecb993d67 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX desktop_entries/screensaver-properties.desktop 1000 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 SHA1 f55ab9f6430ee339edc6aab428bc277d1b84e03d SHA256 b2a5d44a6a6463beab7cb1d3b9d9f5613c765b48ce319232517b6097afad1fbd
 MD5 51377e1938cf119bd11972b3c30c0a25 files/desktop_entries/screensaver-properties.desktop 1000
 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 files/desktop_entries/screensaver-properties.desktop 1000
@@ -62,6 +65,14 @@ AUX xscreensaver-4.24-words.patch 530 RMD160 c9a494f1af1d26076a01e9df58992715057
 MD5 e31491a2c6541da4a97afff5f7427abd files/xscreensaver-4.24-words.patch 530
 RMD160 c9a494f1af1d26076a01e9df58992715057fdca0 files/xscreensaver-4.24-words.patch 530
 SHA256 c5dbaf93b151c3f4b4d2a9aca875840f62b7205d836f0eb9cc20cbd53507e1fc files/xscreensaver-4.24-words.patch 530
+AUX xscreensaver-5.00-gentoo.patch 5690 RMD160 7b33957657e884c4c40e0fe2e2e767b630496d60 SHA1 a8b68d552e56c4d06d9050a4d136f86c896f6003 SHA256 cbd703a47df6207a3d7784e984760e03a87de2ed09403ac99433126575fc8e25
+MD5 bb1456cec15a55637099aece5605050b files/xscreensaver-5.00-gentoo.patch 5690
+RMD160 7b33957657e884c4c40e0fe2e2e767b630496d60 files/xscreensaver-5.00-gentoo.patch 5690
+SHA256 cbd703a47df6207a3d7784e984760e03a87de2ed09403ac99433126575fc8e25 files/xscreensaver-5.00-gentoo.patch 5690
+AUX xscreensaver-5.00-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad SHA1 eb2465eb92bc8ad696cb6413cfd0d8c211ad1df6 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d
+MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.00-nsfw.patch 6673
+RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.00-nsfw.patch 6673
+SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.00-nsfw.patch 6673
 AUX xscreensaver-blank-screen.patch 487 RMD160 304dd508a11972ac06ea157effa7bf11fe9f5154 SHA1 6f383f9797797fb1478328632340c6d14031610e SHA256 166ba0d6283e262886230439dc69dc5e746fec0c779727a6e2aec4b40d6f7de8
 MD5 7528066fa9a88bd1b6d46224d118dd7b files/xscreensaver-blank-screen.patch 487
 RMD160 304dd508a11972ac06ea157effa7bf11fe9f5154 files/xscreensaver-blank-screen.patch 487
@@ -69,6 +80,7 @@ SHA256 166ba0d6283e262886230439dc69dc5e746fec0c779727a6e2aec4b40d6f7de8 files/xs
 DIST xscreensaver-4.22.tar.gz 4620066
 DIST xscreensaver-4.23.tar.gz 4939070 RMD160 b18c2e45fca132e017bd24e6e8fca91154fa03db SHA256 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7
 DIST xscreensaver-4.24.tar.gz 4936993 RMD160 a7cb8262991d6783bd0da843bc6dbdce6976e287 SHA1 9573a5c561422fed2845d37f3ad43fa3e2b62247 SHA256 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474
+DIST xscreensaver-5.00.tar.gz 5263478 RMD160 7630ff42cfd24557cf1459902ddc6256004fc938 SHA1 631eb0414112b2db2e62e2ab5a984726d61696d2 SHA256 976e888bead1185ce3116a92df2829f9fe93061d0539f5d8036ca0ddc016d80f
 EBUILD xscreensaver-4.22-r4.ebuild 5925 RMD160 d076f6e44c2685cab6fa6de221ad444d9ef0752e SHA1 18fa8170b5cb8ab371d423deb1de92242b778d85 SHA256 0f7e8846e649507ce432f7dd41537c97a525acbc1749ced6c8b837157f5848e0
 MD5 7f49b40e9f78a7bc3d4c965dc4bdff0c xscreensaver-4.22-r4.ebuild 5925
 RMD160 d076f6e44c2685cab6fa6de221ad444d9ef0752e xscreensaver-4.22-r4.ebuild 5925
@@ -81,10 +93,14 @@ EBUILD xscreensaver-4.24.ebuild 5259 RMD160 67d41ded95f1ff68ffac67369f23d0dda1b3
 MD5 3c10b70bbd7e39d6c082713299b6f484 xscreensaver-4.24.ebuild 5259
 RMD160 67d41ded95f1ff68ffac67369f23d0dda1b32695 xscreensaver-4.24.ebuild 5259
 SHA256 87989295a07a9788cc82eb422b27515fe33f0a02b1e013cafb7e7ed8b910deb0 xscreensaver-4.24.ebuild 5259
-MISC ChangeLog 23194 RMD160 2273d79017c7da22b55a118b4785eb8ed818e32f SHA1 ea5a7dab86dba1d4a7369baff997ae1015d492d0 SHA256 f5863edc4178b3eea9ce6e90714570b72775870b69fcc39e7013a72c9775d0d9
-MD5 2b08caf88038a52641a2cc058484a2bb ChangeLog 23194
-RMD160 2273d79017c7da22b55a118b4785eb8ed818e32f ChangeLog 23194
-SHA256 f5863edc4178b3eea9ce6e90714570b72775870b69fcc39e7013a72c9775d0d9 ChangeLog 23194
+EBUILD xscreensaver-5.00.ebuild 5036 RMD160 41269d5b200877830e7ca3098c644aa2a34d38c8 SHA1 585bbb78cf98320696de243cec1f1aeac622e1d3 SHA256 9916c57a5939ed2bbfd953265d0e0c2f7b006073ec4c052650f182b328e6e0f8
+MD5 3766699b4de660e791afe3465f8fc8e5 xscreensaver-5.00.ebuild 5036
+RMD160 41269d5b200877830e7ca3098c644aa2a34d38c8 xscreensaver-5.00.ebuild 5036
+SHA256 9916c57a5939ed2bbfd953265d0e0c2f7b006073ec4c052650f182b328e6e0f8 xscreensaver-5.00.ebuild 5036
+MISC ChangeLog 23541 RMD160 c9f7e19e3e817c3bb7ebc6f45edf1d24e2ca004f SHA1 01f573222c631526a51bbcc4aabba1d56ae393e7 SHA256 2582c58a1d9c19ffb24b333788f0066733b72d5e4678a757dfd01ac6a92cb74c
+MD5 25d28ccbeb769ca4a69db733d7b7528a ChangeLog 23541
+RMD160 c9f7e19e3e817c3bb7ebc6f45edf1d24e2ca004f ChangeLog 23541
+SHA256 2582c58a1d9c19ffb24b333788f0066733b72d5e4678a757dfd01ac6a92cb74c ChangeLog 23541
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -98,3 +114,13 @@ SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/di
 MD5 99d549469ab8a46ee2eb889208d1fb3c files/digest-xscreensaver-4.24 256
 RMD160 3a41fe3bf7d8364e1940c2496bee84bfc0892f38 files/digest-xscreensaver-4.24 256
 SHA256 9988ae848a4dcb14ec369659a6ca2c7c682a9b35f7ee79edff88f8abff434b5d files/digest-xscreensaver-4.24 256
+MD5 25589d3b5c32825b66ba9676e0d2ad01 files/digest-xscreensaver-5.00 256
+RMD160 b132ef56665cf2e1c437724a4d908d0457210ab6 files/digest-xscreensaver-5.00 256
+SHA256 d8690348f22d988fb3f25fc858fd7c83a1be057c7a4feda8ba9114a6d0aa0f5f files/digest-xscreensaver-5.00 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEgq/3go/w9rxVVVERAoEGAKC/oO2X9qRp/ljKUuz5IR7Ej2cGhACgwlTF
+FzsgKrnL0MxhGgF0KoihU0M=
+=s+j7
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.00 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.00
new file mode 100644
index 000000000000..a3b7450ad65a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.00
@@ -0,0 +1,3 @@
+MD5 2c26877fb0acd508b9a726dce6a77f78 xscreensaver-5.00.tar.gz 5263478
+RMD160 7630ff42cfd24557cf1459902ddc6256004fc938 xscreensaver-5.00.tar.gz 5263478
+SHA256 976e888bead1185ce3116a92df2829f9fe93061d0539f5d8036ca0ddc016d80f xscreensaver-5.00.tar.gz 5263478
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.00-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.00-gentoo.patch
new file mode 100644
index 000000000000..ace6b251d51f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.00-gentoo.patch
@@ -0,0 +1,157 @@
+diff -Nru xscreensaver-5.00.vanilla/configure.in xscreensaver-5.00/configure.in
+--- xscreensaver-5.00.vanilla/configure.in	2006-05-24 00:07:00.000000000 +0200
++++ xscreensaver-5.00/configure.in	2006-06-04 11:35:01.000000000 +0200
+@@ -717,6 +717,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             \
+@@ -747,7 +749,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            \
+@@ -4054,41 +4055,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 -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.00/driver/XScreenSaver.ad.in
+--- xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in	2006-05-24 01:01:34.000000000 +0200
++++ xscreensaver-5.00/driver/XScreenSaver.ad.in	2006-06-04 11:36:55.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 -Nru xscreensaver-5.00.vanilla/driver/xscreensaver.c xscreensaver-5.00/driver/xscreensaver.c
+--- xscreensaver-5.00.vanilla/driver/xscreensaver.c	2006-05-18 01:35:54.000000000 +0200
++++ xscreensaver-5.00/driver/xscreensaver.c	2006-06-04 11:37:16.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 -Nru xscreensaver-5.00.vanilla/hacks/webcollage xscreensaver-5.00/hacks/webcollage
+--- xscreensaver-5.00.vanilla/hacks/webcollage	2006-05-18 01:58:51.000000000 +0200
++++ xscreensaver-5.00/hacks/webcollage	2006-06-04 11:37:18.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/files/xscreensaver-5.00-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.00-nsfw.patch
new file mode 100644
index 000000000000..0d1d810dba46
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.00-nsfw.patch
@@ -0,0 +1,146 @@
+diff -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.00/driver/XScreenSaver.ad.in
+--- xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in	2006-05-24 01:01:34.000000000 +0200
++++ xscreensaver-5.00/driver/XScreenSaver.ad.in	2006-06-04 11:39:04.000000000 +0200
+@@ -302,10 +302,6 @@
+ 				fiberlamp -root				    \n\
+ 				boxfit -root				    \n\
+ 				celtic -root				    \n\
+-- default-n:			webcollage -root			    \n\
+-- default-n:  "WebCollage (whacked)"					      \
+-				webcollage -root -filter		      \
+-				  'vidwhacker -stdin -stdout'		    \n\
+ - default-n:			vidwhacker -root			    \n\
+ 									      \
+ @GL_KLUDGE@ GL:			gears -root				    \n\
+@@ -488,7 +484,6 @@
+ *hacks.xanalogtv.name:      XAnalogTV
+ *hacks.xspirograph.name:    XSpiroGraph
+ *hacks.nerverot.name:       NerveRot
+-*hacks.webcollage.name:     WebCollage
+ *hacks.vidwhacker.name:     VidWhacker
+ *hacks.morph3d.name:        Morph3D
+ *hacks.bubble3d.name:       Bubble3D
+diff -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver_ad.h xscreensaver-5.00/driver/XScreenSaver_ad.h
+--- xscreensaver-5.00.vanilla/driver/XScreenSaver_ad.h	2006-05-24 01:01:34.000000000 +0200
++++ xscreensaver-5.00/driver/XScreenSaver_ad.h	2006-06-04 11:39:04.000000000 +0200
+@@ -203,10 +203,6 @@
+ 				fiberlamp -root				    \\n\
+ 				boxfit -root				    \\n\
+ 				celtic -root				    \\n\
+-- default-n:			webcollage -root			    \\n\
+-- default-n:  \"WebCollage (whacked)\"					      \
+-				webcollage -root -filter		      \
+-				  'vidwhacker -stdin -stdout'		    \\n\
+ - default-n:			vidwhacker -root			    \\n\
+ 									      \
+ 	   GL:			gears -root				    \\n\
+@@ -359,7 +355,6 @@
+ "*hacks.xanalogtv.name:      XAnalogTV",
+ "*hacks.xspirograph.name:    XSpiroGraph",
+ "*hacks.nerverot.name:       NerveRot",
+-"*hacks.webcollage.name:     WebCollage",
+ "*hacks.vidwhacker.name:     VidWhacker",
+ "*hacks.morph3d.name:        Morph3D",
+ "*hacks.bubble3d.name:       Bubble3D",
+diff -Nru xscreensaver-5.00.vanilla/hacks/Makefile.in xscreensaver-5.00/hacks/Makefile.in
+--- xscreensaver-5.00.vanilla/hacks/Makefile.in	2006-05-24 01:01:36.000000000 +0200
++++ xscreensaver-5.00/hacks/Makefile.in	2006-06-04 11:39:04.000000000 +0200
+@@ -102,7 +102,7 @@
+ 		  blaster.c bumps.c ripples.c xspirograph.c \
+ 		  nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
+ 		  rotzoomer.c whirlygig.c speedmine.c vermiculate.c \
+-		  xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \
++		  xpm-pixmap.c twang.c apollonian.c \
+ 		  euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \
+ 		  anemone.c halftone.c metaballs.c eruption.c popsquares.c \
+ 		  barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \
+@@ -111,7 +111,7 @@
+ 		  fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
+ 		  intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
+ 		  boxfit.c interaggregate.c celtic.c
+-SCRIPTS		= vidwhacker webcollage ljlatest
++SCRIPTS		= vidwhacker ljlatest
+ 
+ # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
+ # but that are not shipped with xscreensaver itself.
+@@ -139,7 +139,7 @@
+ 		  blaster.o bumps.o ripples.o xspirograph.o \
+ 		  nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \
+ 		  rotzoomer.o whirlygig.o speedmine.o vermiculate.o \
+-		  xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \
++		  xpm-pixmap.o twang.o apollonian.o \
+ 		  euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \
+ 		  anemone.o halftone.o metaballs.o eruption.o popsquares.o \
+ 		  barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \
+@@ -171,7 +171,7 @@
+ 		  celtic \
+ 		  @JPEG_EXES@
+ SEXES		= sonar
+-JPEG_EXES	= webcollage-helper
++JPEG_EXES	= 
+ EXES		= $(NEXES) $(SEXES)
+ 
+ HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
+@@ -208,7 +208,7 @@
+ 	          spotlight.man squiral.man starfish.man strange.man \
+ 	          swirl.man t3d.man thornbird.man triangle.man truchet.man \
+ 	          twang.man vermiculate.man vidwhacker.man vines.man \
+-	          wander.man webcollage.man whirlwindwarp.man whirlygig.man \
++	          wander.man whirlwindwarp.man whirlygig.man \
+ 	          worm.man xflame.man xjack.man xlyap.man xmatrix.man \
+ 	          xrayswarm.man xspirograph.man xsublim.man \
+ 	          zoom.man halftone.man eruption.man metaballs.man \
+@@ -1520,7 +1520,6 @@
+ wander.o: ../config.h
+ wander.o: $(srcdir)/screenhackI.h
+ wander.o: $(srcdir)/screenhack.h
+-webcollage-helper.o: ../config.h
+ whirlwindwarp.o: ../config.h
+ whirlwindwarp.o: $(srcdir)/screenhackI.h
+ whirlwindwarp.o: $(srcdir)/screenhack.h
+diff -Nru xscreensaver-5.00.vanilla/hacks/glx/glsnake.c xscreensaver-5.00/hacks/glx/glsnake.c
+--- xscreensaver-5.00.vanilla/hacks/glx/glsnake.c	2006-05-03 21:39:21.000000000 +0200
++++ xscreensaver-5.00/hacks/glx/glsnake.c	2006-06-04 11:40:30.000000000 +0200
+@@ -565,21 +565,6 @@
+ 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, PIN, ZERO }
+     },
+-    { "erect penis",     /* thanks benno */
+-      { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+-	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
+-	ZERO, ZERO }
+-    },
+-    { "flaccid penis",
+-      { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+-	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+-	ZERO, ZERO }
+-    },
+-    { "vagina",
+-      { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+-	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+-	PIN, RIGHT, ZERO }
+-    },
+     { "mask",
+       { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN,
+ 	ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO,
+@@ -995,9 +980,6 @@
+     { "Parrot",
+         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
+     },
+-    { "Penis",
+-        { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
+-    },
+     { "PictureComingSoon",
+         { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT, ZERO }
+     },
+diff -Nru xscreensaver-5.00.vanilla/po/POTFILES.in xscreensaver-5.00/po/POTFILES.in
+--- xscreensaver-5.00.vanilla/po/POTFILES.in	2006-05-24 01:01:41.000000000 +0200
++++ xscreensaver-5.00/po/POTFILES.in	2006-06-04 11:39:04.000000000 +0200
+@@ -203,7 +203,6 @@
+ hacks/config/vidwhacker.xml
+ hacks/config/vines.xml
+ hacks/config/wander.xml
+-hacks/config/webcollage.xml
+ hacks/config/whirlwindwarp.xml
+ hacks/config/whirlygig.xml
+ hacks/config/worm.xml
diff --git a/x11-misc/xscreensaver/xscreensaver-5.00.ebuild b/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
new file mode 100644
index 000000000000..f5feb9d31c95
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.00.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-5.00.ebuild,v 1.1 2006/06/04 10:01:47 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="|| ( (
+		x11-libs/libXxf86misc
+		x11-apps/xwininfo
+		x11-apps/appres
+		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
+		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}"
+
+	# Bug fixes:
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
+
+	eautoreconf
+
+	# 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
+
+	ewarn
+	ewarn "In XScreenSaver 5.00 API was changed. All third party screen savers"
+	ewarn "need to be ported to the new API. Until then they will not work."
+	ewarn
+	epause
+
+}