implemented a nsfw (offensive) USE flag to allow users to explicitly enable questionable shapes in glsnakes (#46256)

4 files changed, 55 insertions, 8 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 7f93229b9a85..471d634c51d0 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for x11-misc/xscreensaver
+ ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.57 2004/07/24 05:43:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.58 2004/07/24 06:28:11 liquidx Exp $
+
+  24 Jul 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/xscreensaver-4.16-nsfw.patch, xscreensaver-4.16.ebuild:
+  implemented a "offensive" USE flag to allow users to explicitly
+  enable questionable shapes in glsnakes (#46256)
 
 *xscreensaver-4.16 (24 Jul 2004)
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 92bbbb7f7f04..44997d9c3943 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,6 +1,6 @@
 MD5 e6d30dd55a138f1df371b5c57146d787 xscreensaver-4.14-r2.ebuild 4665
-MD5 b5a8902b1dd3813e4e20e4dfe6e2b5c8 xscreensaver-4.16.ebuild 4633
-MD5 645fddf4c2b3763ea61126ae0e47cbb2 ChangeLog 10997
+MD5 9add24bebd7479c0281684088a2d8f3d xscreensaver-4.16.ebuild 4710
+MD5 2118bfbd805f94948ac705b9fcd6c1a9 ChangeLog 11227
 MD5 0c7e1c065d3ff356793aa700b36c3380 metadata.xml 309
 MD5 47a7c7489bfb281970e80d9dd5d9a016 xscreensaver-4.15.ebuild 4511
 MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
@@ -10,4 +10,5 @@ MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
 MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
 MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
+MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.16-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-4.16-nsfw.patch
new file mode 100644
index 000000000000..54b143f43ae9
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.16-nsfw.patch
@@ -0,0 +1,38 @@
+*** hacks/glx/glsnake.c	Sun Sep 28 02:33:57 2003
+--- hacks/glx/glsnakepatched.c	Tue Mar 30 13:52:54 2004
+***************
+*** 559,579 ****
+  	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,
+--- 559,564 ----
+***************
+*** 985,993 ****
+      { "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 }
+      },
+--- 970,975 ----
diff --git a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
index 373bb1aacc84..ab1c97df9ba4 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.1 2004/07/24 05:43:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.2 2004/07/24 06:28:11 liquidx Exp $
 
 inherit eutils
 
-IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama"
+IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama offensive"
 
 DESCRIPTION="a modular screensaver for X11"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -73,12 +73,15 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
 	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.10-norpm.patch
+	epatch ${FILESDIR}/${PN}-4.10-norpm.patch
 	# set default fortune to /usr/bin/fortune even if one can't be found
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-fortune.patch
+	epatch ${FILESDIR}/${PN}-4.14-fortune.patch
 	# disabled because it is out of date - liquidx (15/06/2004)
 	# use icc && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-icc.patch
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
 }
 
 src_compile() {