Version bump.

(Portage version: 2.1_pre4-r1)

15 files changed, 375 insertions, 121 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 477fe8fe9cca..b88a0201643c 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,19 @@
 # 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.132 2006/02/11 18:28:57 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.133 2006/02/12 11:23:16 nelchael Exp $
+
+*xscreensaver-4.24 (12 Feb 2006)
+
+  12 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/xscreensaver-4.14-fortune.patch,
+  -files/xscreensaver-4.20-norpm.patch, -files/xscreensaver-4.23-dpms.patch,
+  +files/xscreensaver-4.24-app-defaults.patch,
+  +files/xscreensaver-4.24-norpm.patch, +files/xscreensaver-4.24-nsfw.patch,
+  +files/xscreensaver-4.24-settings.patch,
+  +files/xscreensaver-4.24-silent.patch,
+  +files/xscreensaver-4.24-words.patch, -files/pam.d/xscreensaver,
+  -xscreensaver-4.23-r2.ebuild, +xscreensaver-4.24.ebuild:
+  Version bump, 4.24 contains the DPMS fix from 4.23-r2, so 4.23-r2 was removed.
 
   11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   xscreensaver-4.23-r2.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 79ee2a60aa20..c8871bb41d77 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -13,6 +13,9 @@ SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/di
 MD5 2dec78c3103e6a62dbcace7dc2d16bf1 files/digest-xscreensaver-4.23-r2 256
 RMD160 b205bfc06fbb52feebef73a04f8771a1d37e9f58 files/digest-xscreensaver-4.23-r2 256
 SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/digest-xscreensaver-4.23-r2 256
+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 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
 RMD160 6d51280f7ad5626c93f43ce2ee2d80b691971990 files/pam.d/xscreensaver 79
 SHA256 53f0ebf0d9c8442c2f513a9a2b8faab71992df4b3475fd1a592f43a0a7dff0c3 files/pam.d/xscreensaver 79
@@ -52,6 +55,24 @@ SHA256 73b01bd257d459399a94f4b31d8fdef281d217452c56dffef95aa5c9d75bce1c files/xs
 MD5 5fbeadbcc85608ca9993c2f7d51292cf files/xscreensaver-4.23-words.patch 530
 RMD160 6931bf3662838f04aa707a70702717bd91954067 files/xscreensaver-4.23-words.patch 530
 SHA256 bb7adab082f070c1db62cd40db7d563b48bd75e60f29bf628f6650023fdc37eb files/xscreensaver-4.23-words.patch 530
+MD5 1d60de421a7c7ec9810bcc7242b1ca92 files/xscreensaver-4.24-app-defaults.patch 1086
+RMD160 2d4b08c64957460d48fb24c3626c96c48ecf07b5 files/xscreensaver-4.24-app-defaults.patch 1086
+SHA256 4a05d7ccd748b6c0519dd72aa02fa9c46dfd8dadd5660172b1ff6197d733e05c files/xscreensaver-4.24-app-defaults.patch 1086
+MD5 cf14b3db068513e4a86c518767e5edd9 files/xscreensaver-4.24-norpm.patch 1779
+RMD160 ccaa3796c713efd3cbad5e350d86b35f4484bb4e files/xscreensaver-4.24-norpm.patch 1779
+SHA256 14ddcbd86f8c2f092608216d58704ccb01d01a8c7763821d100929cd37fcafdb files/xscreensaver-4.24-norpm.patch 1779
+MD5 0548218af43299434bae28a29f909df6 files/xscreensaver-4.24-nsfw.patch 6682
+RMD160 219b9cf2862e532efb8cb4a254f53f3c674e1be2 files/xscreensaver-4.24-nsfw.patch 6682
+SHA256 c002e236d8483b28cebf498ad1cbbc90e611b56c53753684f94e6d290c8f36df files/xscreensaver-4.24-nsfw.patch 6682
+MD5 e5396d45e46f844fd34e12abc1101e1b files/xscreensaver-4.24-settings.patch 1912
+RMD160 3650e26914d85516d733d2d400b1433645e588df files/xscreensaver-4.24-settings.patch 1912
+SHA256 01769d2f55204025fc05dd85a0e76e25132ec932f652e5fadeacb738c89e8ba5 files/xscreensaver-4.24-settings.patch 1912
+MD5 324a1dc84d81237aa78f51c1889cdc78 files/xscreensaver-4.24-silent.patch 636
+RMD160 130c388ed7466f86fdf4f87edade636d10d41992 files/xscreensaver-4.24-silent.patch 636
+SHA256 c87fc61dcd92c4edac42d4d71d33a190b8b1f6ab9628ce44a5358eb052004980 files/xscreensaver-4.24-silent.patch 636
+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
 MD5 7528066fa9a88bd1b6d46224d118dd7b files/xscreensaver-blank-screen.patch 487
 RMD160 304dd508a11972ac06ea157effa7bf11fe9f5154 files/xscreensaver-blank-screen.patch 487
 SHA256 166ba0d6283e262886230439dc69dc5e746fec0c779727a6e2aec4b40d6f7de8 files/xscreensaver-blank-screen.patch 487
@@ -67,3 +88,6 @@ SHA256 988ef558e18e69338dd9738665dc46bf49fed5da4d55a2c3fd6557d3a15f9f16 xscreens
 MD5 79c7c0183b04aea6963ee6363eac44ef xscreensaver-4.23-r2.ebuild 5535
 RMD160 003555755b9726e8cac1dab8c3d8a20e5f2d2c37 xscreensaver-4.23-r2.ebuild 5535
 SHA256 b6ff440948cae75be52e35675f309b0e817fe9cc0d0780dfe267470e1a757474 xscreensaver-4.23-r2.ebuild 5535
+MD5 83a4e45f5c11265aec495a65e91a2c99 xscreensaver-4.24.ebuild 5249
+RMD160 a57001cb816c2d7ed3355e4b524946eacb33052d xscreensaver-4.24.ebuild 5249
+SHA256 b803d39a7e00d2fc1b8ca12738a5f07bd7a0087631bff240646291eb468f47db xscreensaver-4.24.ebuild 5249
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2
deleted file mode 100644
index 53fe2665124c..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz 4939070
-RMD160 b18c2e45fca132e017bd24e6e8fca91154fa03db xscreensaver-4.23.tar.gz 4939070
-SHA256 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7 xscreensaver-4.23.tar.gz 4939070
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.24 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.24
new file mode 100644
index 000000000000..5f81760603b3
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.24
@@ -0,0 +1,3 @@
+MD5 174b6a7cebd892c1a6c2d56bf5ac5af6 xscreensaver-4.24.tar.gz 4936993
+RMD160 a7cb8262991d6783bd0da843bc6dbdce6976e287 xscreensaver-4.24.tar.gz 4936993
+SHA256 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474 xscreensaver-4.24.tar.gz 4936993
diff --git a/x11-misc/xscreensaver/files/pam.d/xscreensaver b/x11-misc/xscreensaver/files/pam.d/xscreensaver
deleted file mode 100644
index 9490793c7d53..000000000000
--- a/x11-misc/xscreensaver/files/pam.d/xscreensaver
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-
-auth       required	/lib/security/pam_stack.so service=system-auth
-
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.14-fortune.patch b/x11-misc/xscreensaver/files/xscreensaver-4.14-fortune.patch
deleted file mode 100644
index 807dc7ef6580..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.14-fortune.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	2003-11-24 01:00:36.155874384 +0000
-+++ configure	2003-11-24 01:01:36.748662880 +0000
-@@ -18387,7 +18387,7 @@
- 
-   # if we didn't find anything, then just assume /usr/games/
-   if test -z "$fortune_tmp" ; then
--     fortune_tmp="/usr/games/fortune"
-+     fortune_tmp="/usr/bin/fortune"
-   fi
- 
-   ac_cv_fortune_program="$fortune_tmp"
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch
deleted file mode 100644
index b4001dfc5b2e..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	2005-02-23 01:59:54.000000000 -0800
-+++ configure	2005-02-23 10:10:12.082129160 -0800
-@@ -21762,36 +21762,6 @@
- 
- # M4 sucks!!
- 
--rpmv=`(rpm -qv xscreensaver) 2>/dev/null | \
--      sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'`
--
--
--if test \! -z "$rpmv" ; then
--  rpmbdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
--  rpmhdir=`rpm -ql xscreensaver | 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 (with"
--  warn2 '"rpm -ve xscreensaver") before running "make install"'
--  warn2 "from 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
--
--
- if test "${bindir}" = "${HACKDIR}" ; then
-   do_dir_warning=yes
- fi
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch
deleted file mode 100644
index a01bb34f6f21..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-4.23-dpms.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nru xscreensaver-4.23.vanilla/driver/prefs.c xscreensaver-4.23/driver/prefs.c
---- xscreensaver-4.23.vanilla/driver/prefs.c	2006-02-11 13:29:49.000000000 +0100
-+++ xscreensaver-4.23/driver/prefs.c	2006-02-11 13:31:13.000000000 +0100
-@@ -1583,15 +1583,11 @@
-       p->dpms_off < 10 * 1000)
-     p->dpms_off      = 4 * 60 * 60 * 1000;			 /* 4 hours */
- 
--  /* suspend may not be greater than off, unless off is 0.
--     standby may not be greater than suspend, unless suspend is 0.
-+  /* standby may not be greater than suspend.
-+     suspend may not be greater than off.
-    */
--  if (p->dpms_off != 0 &&
--      p->dpms_suspend > p->dpms_off)
--    p->dpms_suspend = p->dpms_off;
--  if (p->dpms_suspend != 0 &&
--      p->dpms_standby > p->dpms_suspend)
--    p->dpms_standby = p->dpms_suspend;
-+  if (p->dpms_standby > p->dpms_suspend) p->dpms_standby = p->dpms_suspend;
-+  if (p->dpms_suspend > p->dpms_off)     p->dpms_suspend = p->dpms_off;
- 
- 
-   if (p->dpms_standby == 0 &&	   /* if *all* are 0, then DPMS is disabled */
-diff -Nru xscreensaver-4.23.vanilla/driver/timers.c xscreensaver-4.23/driver/timers.c
---- xscreensaver-4.23.vanilla/driver/timers.c	2006-02-11 13:29:49.000000000 +0100
-+++ xscreensaver-4.23/driver/timers.c	2006-02-11 13:31:56.000000000 +0100
-@@ -332,15 +332,6 @@
- 
-   si->last_activity_time = time ((time_t *) 0);
- 
--  /* This will (hopefully, supposedly) tell the server to re-set its
--     DPMS timer.  Without this, the -deactivate clientmessage would
--     prevent xscreensaver from blanking, but would not prevent the
--     monitor from powering down. */
--  XForceScreenSaver (si->dpy, ScreenSaverReset);
--
--  /* And if the monitor is already powered off, turn it on.
--     You'd think the above would do that, but apparently not? */
--  monitor_power_on (si);
- }
- 
- 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-app-defaults.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-app-defaults.patch
new file mode 100644
index 000000000000..58f82ba181e9
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.24-app-defaults.patch
@@ -0,0 +1,20 @@
+diff -Nru xscreensaver-4.24.vanilla/configure.in xscreensaver-4.24/configure.in
+--- xscreensaver-4.24.vanilla/configure.in	2006-02-12 11:45:45.000000000 +0100
++++ xscreensaver-4.24/configure.in	2006-02-12 11:49:37.000000000 +0100
+@@ -715,6 +715,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             \
+@@ -745,7 +747,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            \
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-norpm.patch
new file mode 100644
index 000000000000..c248fd8c4dc0
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.24-norpm.patch
@@ -0,0 +1,46 @@
+diff -Nru xscreensaver-4.24.vanilla/configure.in xscreensaver-4.24/configure.in
+--- xscreensaver-4.24.vanilla/configure.in	2006-02-12 11:45:45.000000000 +0100
++++ xscreensaver-4.24/configure.in	2006-02-12 11:50:23.000000000 +0100
+@@ -4070,41 +4070,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/xscreensaver-4.24-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-nsfw.patch
new file mode 100644
index 000000000000..b43947890c8e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.24-nsfw.patch
@@ -0,0 +1,146 @@
+diff -Nru xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in xscreensaver-4.24/driver/XScreenSaver.ad.in
+--- xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in	2006-02-12 11:45:45.000000000 +0100
++++ xscreensaver-4.24/driver/XScreenSaver.ad.in	2006-02-12 11:52:42.000000000 +0100
+@@ -318,10 +318,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\
+@@ -508,7 +504,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-4.24.vanilla/driver/XScreenSaver_ad.h xscreensaver-4.24/driver/XScreenSaver_ad.h
+--- xscreensaver-4.24.vanilla/driver/XScreenSaver_ad.h	2006-02-12 11:45:45.000000000 +0100
++++ xscreensaver-4.24/driver/XScreenSaver_ad.h	2006-02-12 11:52:42.000000000 +0100
+@@ -219,10 +219,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\
+@@ -379,7 +375,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-4.24.vanilla/hacks/Makefile.in xscreensaver-4.24/hacks/Makefile.in
+--- xscreensaver-4.24.vanilla/hacks/Makefile.in	2006-02-12 11:45:44.000000000 +0100
++++ xscreensaver-4.24/hacks/Makefile.in	2006-02-12 11:52:42.000000000 +0100
+@@ -100,7 +100,7 @@
+ 		  blaster.c bumps.c ripples.c xteevee.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 \
+@@ -109,7 +109,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
+ 
+ OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
+ 		  bubbles-default.o decayscreen.o deco.o drift.o flag.o \
+@@ -130,7 +130,7 @@
+ 		  blaster.o bumps.o ripples.o xteevee.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 \
+@@ -162,7 +162,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 \
+@@ -198,7 +198,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 xteevee.man \
+ 	          zoom.man halftone.man eruption.man metaballs.man \
+@@ -1471,7 +1471,6 @@
+ vines.o: $(srcdir)/xlockmore.h
+ wander.o: ../config.h
+ wander.o: $(srcdir)/screenhack.h
+-webcollage-helper.o: ../config.h
+ whirlwindwarp.o: ../config.h
+ whirlwindwarp.o: $(srcdir)/screenhack.h
+ whirlygig.o: ../config.h
+diff -Nru xscreensaver-4.24.vanilla/hacks/glx/glsnake.c xscreensaver-4.24/hacks/glx/glsnake.c
+--- xscreensaver-4.24.vanilla/hacks/glx/glsnake.c	2006-02-12 11:45:44.000000000 +0100
++++ xscreensaver-4.24/hacks/glx/glsnake.c	2006-02-12 11:53:29.000000000 +0100
+@@ -563,21 +563,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,
+@@ -993,9 +978,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 }
+-    },
+     { "PictureCommingSoon",
+         { 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-4.24.vanilla/po/POTFILES.in xscreensaver-4.24/po/POTFILES.in
+--- xscreensaver-4.24.vanilla/po/POTFILES.in	2006-02-12 11:45:44.000000000 +0100
++++ xscreensaver-4.24/po/POTFILES.in	2006-02-12 11:52:42.000000000 +0100
+@@ -200,7 +200,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/files/xscreensaver-4.24-settings.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-settings.patch
new file mode 100644
index 000000000000..c9a3bfcd636a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.24-settings.patch
@@ -0,0 +1,66 @@
+diff -Nru xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in xscreensaver-4.24/driver/XScreenSaver.ad.in
+--- xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in	2006-02-12 11:45:45.000000000 +0100
++++ xscreensaver-4.24/driver/XScreenSaver.ad.in	2006-02-12 12:00:11.000000000 +0100
+@@ -31,19 +31,19 @@
+ *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
+ *lockVTs:		True
+ *verbose:		False
+ *timestamp:		True
+@@ -51,17 +51,17 @@
+ *unfade:		False
+ *fadeSeconds:		0:00:03
+ *fadeTicks:		20
+-*splash:		True
++*splash:		False
+ *splashDuration:	0:00:05
+ *visualID:		default
+ *captureStderr: 	False
+ *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
+@@ -118,7 +118,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/xscreensaver-4.24-silent.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-silent.patch
new file mode 100644
index 000000000000..1f034bf2692b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.24-silent.patch
@@ -0,0 +1,16 @@
+diff -Nru xscreensaver-4.24.vanilla/driver/xscreensaver.c xscreensaver-4.24/driver/xscreensaver.c
+--- xscreensaver-4.24.vanilla/driver/xscreensaver.c	2006-02-12 11:45:45.000000000 +0100
++++ xscreensaver-4.24/driver/xscreensaver.c	2006-02-12 11:51:47.000000000 +0100
+@@ -1653,10 +1653,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 --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-words.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-words.patch
new file mode 100644
index 000000000000..0e4a30ce65b2
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.24-words.patch
@@ -0,0 +1,13 @@
+diff -Nru xscreensaver-4.24.vanilla/hacks/webcollage xscreensaver-4.24/hacks/webcollage
+--- xscreensaver-4.24.vanilla/hacks/webcollage	2006-02-12 11:45:44.000000000 +0100
++++ xscreensaver-4.24/hacks/webcollage	2006-02-12 11:50:53.000000000 +0100
+@@ -837,7 +837,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-4.23-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.24.ebuild
index b5d897b31ba3..843261918634 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.23-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.24.ebuild
@@ -1,6 +1,6 @@
 # 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-4.23-r2.ebuild,v 1.2 2006/02/11 18:28:57 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.24.ebuild,v 1.1 2006/02/12 11:23:16 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -50,7 +50,9 @@ 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:"
@@ -59,46 +61,48 @@ pkg_setup() {
 		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}
+
+	unpack "${A}"
+	cd "${S}"
 
 	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	# use gnome-terminal in tests rather than gnome-open (bug #94708)
-	# and bug 118028:
+	# bug #118028:
 	epatch "${FILESDIR}/${P}-norpm.patch"
 
 	# tweaks the default configuration (driver/XScreenSaver.ad.in)
-	epatch ${FILESDIR}/${PN}-4.22-settings.patch
+	epatch "${FILESDIR}/${P}-settings.patch"
 
 	# makes the blank screen REALLY blank
-	epatch ${FILESDIR}/${PN}-blank-screen.patch
+	epatch "${FILESDIR}/${P}-silent.patch"
 
 	# disable not-safe-for-work xscreensavers
-	use offensive || epatch ${FILESDIR}/${P}-nsfw.patch
+	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
 
-	# If offensive is set patch webcollage to work:
-	use offensive && epatch ${FILESDIR}/${P}-words.patch
+	# Patch webcollage to work:
+	epatch "${FILESDIR}/${P}-words.patch"
 
 	# Fix for modular X:
 	epatch "${FILESDIR}/${P}-app-defaults.patch"
-	eautoreconf
 
-	# Fix bug #113951:
-	epatch "${FILESDIR}/${P}-dpms.patch"
+	eautoreconf
 
 	# change old head/tail to POSIX ones
 	ht_fix_all
+
 }
 
 src_compile() {
+
 	local myconf
 	use kerberos && use krb4 \
 		&& myconf="${myconf} --with-kerberos" \
@@ -131,10 +135,12 @@ src_compile() {
 		${myconf} || die "econf failed"
 
 	emake || die "emake failed"
+
 }
 
 src_install() {
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
+
+	[[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
 
 	make install_prefix="${D}" install || die "make install failed"
 
@@ -142,28 +148,32 @@ src_install() {
 
 	# 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
+		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
+		newins "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
+
 	fi
 
 	# Remove "extra" capplet
-	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
+	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."
@@ -185,8 +195,4 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	einfo
-	einfo "The gtk USE flag has been dropped. gtk is now required for Gentoo's"
-	einfo "xscreensaver. If this is a problem, bug upstream."
-	einfo
 }