Fix bug 103267.

Package-Manager: portage-2.0.53_rc6

4 files changed, 122 insertions, 14 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index b57ade88e9e9..2d9f414cefd5 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.112 2005/10/17 16:00:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.113 2005/10/25 11:19:30 nelchael Exp $
+
+  25 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xscreensaver-4.22-nsfw-webcollage.patch,
+  xscreensaver-4.22-r4.ebuild:
+  Fix bug 103267 - remove webcollage when -offensive is in USE.
 
   17 Oct 2005; <dang@gentoo.org> xscreensaver-4.22-r4.ebuild:
   Marked stable on amd64
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index ff7e5f453ecd..c2be62419656 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5415e2cf125fb798fd4a500c837a507a ChangeLog 19408
+MD5 4d495dd8a188c4b738cf887c56d507a2 ChangeLog 19611
 MD5 51377e1938cf119bd11972b3c30c0a25 files/desktop_entries/screensaver-properties.desktop 1000
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
 MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r2 70
@@ -12,16 +9,10 @@ MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
 MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
 MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 1592
 MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
+MD5 cab8a426e9f99c0b49f598983b896b80 files/xscreensaver-4.22-nsfw-webcollage.patch 5029
 MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
 MD5 7528066fa9a88bd1b6d46224d118dd7b files/xscreensaver-blank-screen.patch 487
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 30baa75aa8ad6b15fa87c15cce9d3f40 xscreensaver-4.20.ebuild 4842
 MD5 ec122eaf5cf8ae7c3738b52c5d3d42c1 xscreensaver-4.22-r2.ebuild 5474
-MD5 55a3de6db909c2d6b9735ffc4edf1b2d xscreensaver-4.22-r4.ebuild 5583
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDU8qwomPajV0RnrERAgF2AJoC3XflMwKcwwhQEO0JDSQCMf1dPwCdFq7G
-HhdKgoOCVeNq4DLrPS1dVyw=
-=9ZW4
------END PGP SIGNATURE-----
+MD5 b45b943068a44b872e23f1c8c0f2d857 xscreensaver-4.22-r4.ebuild 5657
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
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
index 1185bd969af5..1991b3cd1149 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild,v 1.11 2005/10/17 16:00:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild,v 1.12 2005/10/25 11:19:30 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails
 
@@ -85,6 +85,7 @@ src_unpack() {
 
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
+	use offensive || epatch ${FILESDIR}/${PN}-4.22-nsfw-webcollage.patch
 
 	# change old head/tail to POSIX ones
 	#cd hacks