x11-misc/xscreensaver: Expand offensive words list

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Closes: https://bugs.gentoo.org/699512
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
new file mode 100644 (file)
index 0000000..25ee7a9
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
@@ -0,0 +1,68 @@
+--- a/hacks/barcode.c
++++ a/hacks/barcode.c
+@@ -118,8 +118,6 @@
+   "belly",
+   "bliss",
+   "bogosity",
+-  "boobies",
+-  "boobs",
+   "booty",
+   "bread",
+   "bubba",
+@@ -132,7 +130,6 @@
+   "children",
+   "chocolate",
+   "CLONE",
+-  "cock",
+   "constriction",
+   "contrition",
+   "cop",
+@@ -266,7 +263,6 @@
+   "punishment",
+   "punk rock",
+   "punk",
+-  "pussy",
+   "quagmire",
+   "quarantine",
+   "quartz",
+@@ -334,8 +330,6 @@
+   "vegetarian",
+   "venom",
+   "verifiability",
+-  "viagra",
+-  "vibrator",
+   "victim",
+   "vignette",
+   "villainy",
+--- a/hacks/glx/glsnake.c
++++ a/hacks/glx/glsnake.c
+@@ -565,17 +565,17 @@
+       ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+       ZERO, PIN, ZERO }
+     },
+-    { "erect penis",     /* thanks benno */
++    { "shuffle board",     /* 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",
++    { "flaccid anchor",
+       { 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",
++    { "engagement ring",
+       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+       LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+       PIN, RIGHT, ZERO }
+@@ -995,7 +995,7 @@
+     { "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",
++    { "Shuttle",
+         { 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",

diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
new file mode 100644 (file)
index 0000000..0232343
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="
+       ${HOMEPAGE}${P}.tar.gz -> ${P}-r1.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+       >=gnome-base/libglade-2
+       dev-libs/libxml2
+       media-libs/netpbm
+       x11-apps/appres
+       x11-apps/xwininfo
+       x11-libs/gdk-pixbuf:2[X]
+       x11-libs/gtk+:2
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXft
+       x11-libs/libXi
+       x11-libs/libXmu
+       x11-libs/libXrandr
+       x11-libs/libXt
+       x11-libs/libXxf86misc
+       x11-libs/libXxf86vm
+       jpeg? ( virtual/jpeg:0 )
+       new-login? (
+               gdm? ( gnome-base/gdm )
+               !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+               )
+       opengl? (
+               virtual/glu
+               virtual/opengl
+       )
+       pam? ( sys-libs/pam )
+       xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+       ${COMMON_DEPEND}
+       perl? (
+               dev-lang/perl
+               dev-perl/libwww-perl
+               virtual/perl-Digest-MD5
+       )
+       selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+       ${COMMON_DEPEND}
+       dev-util/intltool
+       sys-devel/bc
+       sys-devel/gettext
+       virtual/pkgconfig
+       x11-base/xorg-proto
+"
+PATCHES=(
+       "${FILESDIR}"/${PN}-5.05-interix.patch
+       "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
+       "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
+       "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
+       "${FILESDIR}"/${PN}-5.31-pragma.patch
+       "${FILESDIR}"/${PN}-5.43-gentoo.patch
+)
+
+src_prepare() {
+       sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+       strip-linguas -i po/
+       export ALL_LINGUAS="${LINGUAS}"
+
+       if use new-login && ! use gdm; then #392967
+               sed -i \
+                       -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+                       configure{,.in} || die
+       fi
+
+       default
+
+       use offensive || eapply "${FILESDIR}"/${PN}-5.43-offensive.patch
+
+       eapply_user
+
+       eautoconf
+       eautoheader
+}
+
+src_configure() {
+       if use ppc || use ppc64; then
+               filter-flags -maltivec -mabi=altivec
+               append-flags -U__VEC__
+       fi
+
+       unset BC_ENV_ARGS #24568
+       export RPM_PACKAGE_VERSION=no #368025
+
+       econf \
+               $(use_with jpeg) \
+               $(use_with new-login login-manager) \
+               $(use_with opengl gl) \
+               $(use_with pam) \
+               $(use_with suid setuid-hacks) \
+               $(use_with xinerama xinerama-ext) \
+               --enable-locking \
+               --with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+               --with-dpms-ext \
+               --with-gtk \
+               --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+               --with-pixbuf \
+               --with-proc-interrupts \
+               --with-randr-ext \
+               --with-text-file="${EPREFIX}"/etc/gentoo-release \
+               --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+               --with-xdbe-ext \
+               --with-xf86gamma-ext \
+               --with-xf86vmode-ext \
+               --with-xinput-ext \
+               --with-xshm-ext \
+               --without-gle \
+               --without-kerberos \
+               --x-includes="${EPREFIX}"/usr/include \
+               --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+       emake install_prefix="${D}" install
+
+       dodoc README{,.hacking}
+
+       use pam && fperms 755 /usr/bin/${PN}
+       pamd_mimic_system ${PN} auth
+
+       rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}