Version bumpd.

Package-Manager: portage-2.0.53_rc6

2 files changed, 147 insertions, 0 deletions

diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23
new file mode 100644
index 000000000000..701eee036446
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23
@@ -0,0 +1 @@
+MD5 27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz 4939070
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-nsfw.patch
new file mode 100644
index 000000000000..890aa86eb1de
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.23-nsfw.patch
@@ -0,0 +1,146 @@
+diff -Nru xscreensaver-4.23/driver/XScreenSaver.ad.in xscreensaver-4.23.nsfw/driver/XScreenSaver.ad.in
+--- xscreensaver-4.23/driver/XScreenSaver.ad.in	2005-10-22 06:50:00.000000000 +0200
++++ xscreensaver-4.23.nsfw/driver/XScreenSaver.ad.in	2005-10-30 17:26:01.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.23/driver/XScreenSaver_ad.h xscreensaver-4.23.nsfw/driver/XScreenSaver_ad.h
+--- xscreensaver-4.23/driver/XScreenSaver_ad.h	2005-10-22 08:43:56.000000000 +0200
++++ xscreensaver-4.23.nsfw/driver/XScreenSaver_ad.h	2005-10-30 17:26:30.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.23/hacks/Makefile.in xscreensaver-4.23.nsfw/hacks/Makefile.in
+--- xscreensaver-4.23/hacks/Makefile.in	2005-10-22 08:43:59.000000000 +0200
++++ xscreensaver-4.23.nsfw/hacks/Makefile.in	2005-10-30 17:27:29.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 \
+@@ -1467,7 +1467,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.23/hacks/glx/glsnake.c xscreensaver-4.23.nsfw/hacks/glx/glsnake.c
+--- xscreensaver-4.23/hacks/glx/glsnake.c	2005-03-07 03:31:18.000000000 +0100
++++ xscreensaver-4.23.nsfw/hacks/glx/glsnake.c	2005-10-30 17:24:47.000000000 +0100
+@@ -547,21 +547,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,
+@@ -973,9 +958,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 }
+     },
+-    { "Penis",
+-        { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN }
+-    },
+     { "PictureCommingSoon",
+         { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT }
+     },
+diff -Nru xscreensaver-4.23/po/POTFILES.in xscreensaver-4.23.nsfw/po/POTFILES.in
+--- xscreensaver-4.23/po/POTFILES.in	2005-10-22 08:44:11.000000000 +0200
++++ xscreensaver-4.23.nsfw/po/POTFILES.in	2005-10-30 17:27:37.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