Fix bug 103267.

(Portage version: 2.0.53_rc6)

1 files changed, 111 insertions, 0 deletions

diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-nsfw-webcollage.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-nsfw-webcollage.patch
new file mode 100644
index 000000000000..5c8b05d91c18
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.22-nsfw-webcollage.patch
@@ -0,0 +1,111 @@
+diff -Nru xscreensaver-4.22.old/driver/XScreenSaver.ad.in xscreensaver-4.22/driver/XScreenSaver.ad.in
+--- xscreensaver-4.22.old/driver/XScreenSaver.ad.in	2005-10-01 10:02:59.000000000 +0200
++++ xscreensaver-4.22/driver/XScreenSaver.ad.in	2005-10-01 10:20:23.000000000 +0200
+@@ -318,10 +318,6 @@
+ 				fireworkx -root				    \n\
+ 				fiberlamp -root				    \n\
+ 				boxfit -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\
+@@ -504,7 +500,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.22.old/driver/XScreenSaver_ad.h xscreensaver-4.22/driver/XScreenSaver_ad.h
+--- xscreensaver-4.22.old/driver/XScreenSaver_ad.h	2005-10-01 10:02:59.000000000 +0200
++++ xscreensaver-4.22/driver/XScreenSaver_ad.h	2005-10-01 10:20:41.000000000 +0200
+@@ -219,10 +219,6 @@
+ 				fireworkx -root				    \\n\
+ 				fiberlamp -root				    \\n\
+ 				boxfit -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\
+@@ -375,7 +371,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.22.old/hacks/Makefile.in xscreensaver-4.22/hacks/Makefile.in
+--- xscreensaver-4.22.old/hacks/Makefile.in	2005-10-01 10:02:59.000000000 +0200
++++ xscreensaver-4.22/hacks/Makefile.in	2005-10-01 10:19:20.000000000 +0200
+@@ -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
+-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 \
+@@ -161,7 +161,7 @@
+ 		  intermomentary fireworkx fiberlamp boxfit interaggregate \
+ 		  @JPEG_EXES@
+ SEXES		= sonar
+-JPEG_EXES	= webcollage-helper
++JPEG_EXES	= 
+ EXES		= $(NEXES) $(SEXES)
+ 
+ HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
+@@ -197,7 +197,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 \
+@@ -1461,7 +1461,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.22.old/po/POTFILES.in xscreensaver-4.22/po/POTFILES.in
+--- xscreensaver-4.22.old/po/POTFILES.in	2005-10-01 10:02:59.000000000 +0200
++++ xscreensaver-4.22/po/POTFILES.in	2005-10-01 10:19:20.000000000 +0200
+@@ -195,7 +195,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