From 51d7665b48cc23f80de632f267f471f1a863d747 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 1 May 2007 18:41:16 +0000 Subject: [PATCH] Fix USE="offensive" patch. Package-Manager: portage-2.1.2.5 --- x11-misc/xscreensaver/ChangeLog | 6 +- x11-misc/xscreensaver/Manifest | 20 ++- .../files/xscreensaver-5.02-nsfw.patch | 158 ++++++++++++++++++ .../xscreensaver/xscreensaver-5.02.ebuild | 4 +- 4 files changed, 177 insertions(+), 11 deletions(-) create mode 100644 x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 3ed237048995..883d1979f488 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.171 2007/05/01 14:10:59 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.172 2007/05/01 18:41:16 drac Exp $ + + 01 May 2007; Samuli Suominen + +files/xscreensaver-5.02-nsfw.patch, xscreensaver-5.02.ebuild: + Fix USE="offensive" patch. *xscreensaver-5.02 (01 May 2007) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 7e5937b26189..0ed4fdc5b15a 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -38,6 +38,10 @@ AUX xscreensaver-5.01-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d5451 MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.01-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.01-nsfw.patch 6673 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.01-nsfw.patch 6673 +AUX xscreensaver-5.02-nsfw.patch 7020 RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 SHA1 25060506a26d6e406622fcc38b6c7899e662b0e8 SHA256 27d5893ac5a123d33c1029c4cd5e2690212562c2b4113c3b9c1d39c34210ff40 +MD5 2ff74ddf7eaa13452ded84caeed509f6 files/xscreensaver-5.02-nsfw.patch 7020 +RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 files/xscreensaver-5.02-nsfw.patch 7020 +SHA256 27d5893ac5a123d33c1029c4cd5e2690212562c2b4113c3b9c1d39c34210ff40 files/xscreensaver-5.02-nsfw.patch 7020 DIST xscreensaver-4.24.tar.gz 4936993 RMD160 a7cb8262991d6783bd0da843bc6dbdce6976e287 SHA1 9573a5c561422fed2845d37f3ad43fa3e2b62247 SHA256 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474 DIST xscreensaver-5.01.tar.gz 5270954 RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b SHA1 c371241c54f4c4cc2dd670852e39f212da3ca991 SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf DIST xscreensaver-5.02.tar.gz 5371759 RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 SHA1 3e02f516efc25755f1a89f5af3983423f639f82b SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d @@ -49,14 +53,14 @@ EBUILD xscreensaver-5.01-r2.ebuild 4858 RMD160 e6aa618f8b918c205588eccdc0c25377a MD5 807261a708a578c61acf12298ae77363 xscreensaver-5.01-r2.ebuild 4858 RMD160 e6aa618f8b918c205588eccdc0c25377a83b71cd xscreensaver-5.01-r2.ebuild 4858 SHA256 631c12133622aae5056bff900a5b958fd5eceb04cc99d8984365ed9782d900bf xscreensaver-5.01-r2.ebuild 4858 -EBUILD xscreensaver-5.02.ebuild 4602 RMD160 18edeeb8f385013847cb4fb6f08da212d8b9200d SHA1 1f15a2e8f46a9e3474c07393c4e7346eb89fa645 SHA256 a0f6d705ab8f241bfaf9e4d8696c00497dc40cd9bf7a3a4e1b4c69b83e53f6da -MD5 af399deec529cbd569cd61c6863c4887 xscreensaver-5.02.ebuild 4602 -RMD160 18edeeb8f385013847cb4fb6f08da212d8b9200d xscreensaver-5.02.ebuild 4602 -SHA256 a0f6d705ab8f241bfaf9e4d8696c00497dc40cd9bf7a3a4e1b4c69b83e53f6da xscreensaver-5.02.ebuild 4602 -MISC ChangeLog 28969 RMD160 58147ede40acbe974e0cc3f52f083ace195779ae SHA1 ca10d498cdee6b5183abc72f9f26d067cfb10060 SHA256 56e63dbab85c3ba7d1d3e5e749fd9577cf3dfa85611691b071bfb1a4e28c665a -MD5 ad06d28e0e5381c1ce5a9f5a26bd9b9a ChangeLog 28969 -RMD160 58147ede40acbe974e0cc3f52f083ace195779ae ChangeLog 28969 -SHA256 56e63dbab85c3ba7d1d3e5e749fd9577cf3dfa85611691b071bfb1a4e28c665a ChangeLog 28969 +EBUILD xscreensaver-5.02.ebuild 4596 RMD160 07f8def0b7ff438bbe553078f926bfec37fa28a0 SHA1 13a8a648915ca33866fb3bad4e217aae25582652 SHA256 5243a40395038c0ad9f3b37fc007e00f76f529e6bb5e5a55f46bef37be748fb9 +MD5 6be14b00fafd7add3655407da098bd5d xscreensaver-5.02.ebuild 4596 +RMD160 07f8def0b7ff438bbe553078f926bfec37fa28a0 xscreensaver-5.02.ebuild 4596 +SHA256 5243a40395038c0ad9f3b37fc007e00f76f529e6bb5e5a55f46bef37be748fb9 xscreensaver-5.02.ebuild 4596 +MISC ChangeLog 29113 RMD160 653635b58edcc5233c04cc2848e40417799718c5 SHA1 63a3509668ac813d19ebcabd14f48a1c20efd2da SHA256 e881ccdfef16fead75ffa0712fbb31fd7afd5cb4b9592b381dabb0f1e6674569 +MD5 49a68fc44a8541d8a5a84c9b59cf49f9 ChangeLog 29113 +RMD160 653635b58edcc5233c04cc2848e40417799718c5 ChangeLog 29113 +SHA256 e881ccdfef16fead75ffa0712fbb31fd7afd5cb4b9592b381dabb0f1e6674569 ChangeLog 29113 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch new file mode 100644 index 000000000000..ac7a1cf2b9aa --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch @@ -0,0 +1,158 @@ +diff -ur xscreensaver-5.02.orig/driver/XScreenSaver.ad.in xscreensaver-5.02/driver/XScreenSaver.ad.in +--- xscreensaver-5.02.orig/driver/XScreenSaver.ad.in 2007-04-21 06:33:17.000000000 +0300 ++++ xscreensaver-5.02/driver/XScreenSaver.ad.in 2007-05-01 21:36:47.000000000 +0300 +@@ -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 -ur xscreensaver-5.02.orig/hacks/glx/glsnake.c xscreensaver-5.02/hacks/glx/glsnake.c +--- xscreensaver-5.02.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 ++++ xscreensaver-5.02/hacks/glx/glsnake.c 2007-05-01 21:35:04.000000000 +0300 +@@ -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 -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefile.in +--- xscreensaver-5.02.orig/hacks/Makefile.in 2007-04-21 06:33:23.000000000 +0300 ++++ xscreensaver-5.02/hacks/Makefile.in 2007-05-01 21:33:28.000000000 +0300 +@@ -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 \ +@@ -110,9 +110,8 @@ + mismunch.c pacman.c pacman_ai.c pacman_level.c \ + fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ + intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \ +- boxfit.c interaggregate.c celtic.c webcollage-cocoa.m \ +- webcollage-helper-cocoa.m +-SCRIPTS = vidwhacker webcollage ljlatest ++ boxfit.c interaggregate.c celtic.c ++SCRIPTS = vidwhacker ljlatest + + # Programs that are mentioned in XScreenSaver.ad, and that have XML files, + # but that are not shipped with xscreensaver itself. +@@ -140,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 \ +@@ -148,8 +147,7 @@ + mismunch.o pacman.o pacman_ai.o pacman_level.o \ + fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \ + intermomentary.o fireworkx.o fiberlamp.o boxfit.o \ +- interaggregate.o celtic.o webcollage-cocoa.o \ +- webcollage-helper-cocoa.o ++ interaggregate.o celtic.o + + NEXES = attraction blitspin bouboule braid bubbles decayscreen deco \ + drift flag flame forest vines galaxy grav greynetic halo \ +@@ -173,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 \ +@@ -209,7 +207,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 \ +@@ -978,10 +976,6 @@ + xsublim: xsublim.o $(HACK_OBJS_1) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS_1) $(HACK_LIBS) + +-webcollage-helper: webcollage-helper.o +- $(CC_HACK) -o $@ $@.o $(XPM_LIBS) $(JPEG_LIBS) +- +- + ############################################################################## + # + # DO NOT DELETE: updated by make distdepend +@@ -2476,17 +2470,6 @@ + wander.o: $(UTILS_SRC)/usleep.h + wander.o: $(UTILS_SRC)/visual.h + wander.o: $(UTILS_SRC)/yarandom.h +-webcollage-cocoa.o: ../config.h +-webcollage-cocoa.o: $(srcdir)/screenhackI.h +-webcollage-cocoa.o: $(srcdir)/screenhack.h +-webcollage-cocoa.o: $(UTILS_SRC)/colors.h +-webcollage-cocoa.o: $(UTILS_SRC)/grabscreen.h +-webcollage-cocoa.o: $(UTILS_SRC)/hsv.h +-webcollage-cocoa.o: $(UTILS_SRC)/resources.h +-webcollage-cocoa.o: $(UTILS_SRC)/usleep.h +-webcollage-cocoa.o: $(UTILS_SRC)/visual.h +-webcollage-cocoa.o: $(UTILS_SRC)/yarandom.h +-webcollage-helper.o: ../config.h + whirlwindwarp.o: ../config.h + whirlwindwarp.o: $(srcdir)/screenhackI.h + whirlwindwarp.o: $(srcdir)/screenhack.h +diff -ur xscreensaver-5.02.orig/po/POTFILES.in xscreensaver-5.02/po/POTFILES.in +--- xscreensaver-5.02.orig/po/POTFILES.in 2007-04-21 06:33:29.000000000 +0300 ++++ xscreensaver-5.02/po/POTFILES.in 2007-05-01 21:35:33.000000000 +0300 +@@ -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.02.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild index 61f3cd7db96d..d233c9083584 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.02.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.1 2007/05/01 14:10:59 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.2 2007/05/01 18:41:16 drac Exp $ inherit eutils flag-o-matic pam fixheadtails autotools @@ -47,7 +47,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-5.01-gentoo.patch" # disable not-safe-for-work xscreensavers - use offensive || epatch "${FILESDIR}/${PN}-5.01-nsfw.patch" + use offensive || epatch "${FILESDIR}/${P}-nsfw.patch" # Fix bug #154444 - hypertorus hack: epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch" -- 2.26.2