commit: 6582e5f33b96f915ab2ff92aadec6bc46c0c5741 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Aug 13 08:17:19 2016 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Aug 13 08:18:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6582e5f3
x11-misc/xscreensaver: Add USE=offensive (bug #591146 by godzil). Package-Manager: portage-2.3.0 .../xscreensaver-5.20-blurb-hndl-test-passwd.patch | 4 +- .../xscreensaver-5.20-test-passwd-segv-tty.patch | 4 +- .../files/xscreensaver-5.20-tests-miscfix.patch | 8 +- .../files/xscreensaver-5.35-gentoo.patch | 47 +++++++ .../files/xscreensaver-5.35-offensive.patch | 59 +++++++++ x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild | 145 +++++++++++++++++++++ 6 files changed, 259 insertions(+), 8 deletions(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch index bfd48d1..1f24953 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch @@ -1,7 +1,7 @@ http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch ---- driver/test-passwd.c -+++ driver/test-passwd.c +--- a/driver/test-passwd.c ++++ b/driver/test-passwd.c @@ -66,6 +66,7 @@ Bool update_screen_layout (saver_info *si) { return 0; } diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch index ab5deeb..bc7f58b 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch @@ -1,7 +1,7 @@ http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch ---- driver/passwd.c -+++ driver/passwd.c +--- a/driver/passwd.c ++++ b/driver/passwd.c @@ -205,7 +205,7 @@ { # ifdef HAVE_SYSLOG diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch index 995b4ea..32fb638 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch @@ -1,7 +1,7 @@ http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch ---- driver/test-xdpms.c -+++ driver/test-xdpms.c +--- a/driver/test-xdpms.c ++++ a/driver/test-xdpms.c @@ -29,7 +29,6 @@ #include <X11/Xproto.h> @@ -10,8 +10,8 @@ http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret); extern Bool DPMSCapable (Display *dpy); ---- driver/Makefile.in -+++ driver/Makefile.in +--- a/driver/Makefile.in ++++ a/driver/Makefile.in @@ -850,7 +850,7 @@ test-mlstring: test-mlstring.o $(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS) diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch new file mode 100644 index 0000000..881869f --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch @@ -0,0 +1,47 @@ +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in +@@ -31,21 +31,21 @@ + *mode: random + *timeout: 0:10:00 + *cycle: 0:10:00 +-*lockTimeout: 0:00:00 ++*lockTimeout: 0:30:00 + *passwdTimeout: 0:00:30 +-*dpmsEnabled: False ++*dpmsEnabled: True + *dpmsQuickoffEnabled: False + *dpmsStandby: 2:00:00 + *dpmsSuspend: 2:00:00 + *dpmsOff: 4:00:00 +-*grabDesktopImages: True ++*grabDesktopImages: False + *grabVideoFrames: False + *chooseRandomImages: @DEFAULT_IMAGES_P@ + ! This can be a local directory name, or the URL of an RSS or Atom feed. + *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ + *nice: 10 + *memoryLimit: 0 +-*lock: False ++*lock: True + *verbose: False + *timestamp: True + *fade: True +@@ -63,7 +63,7 @@ + *textLiteral: XScreenSaver + *textFile: @DEFAULT_TEXT_FILE@ + *textProgram: fortune +-*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss ++*textURL: https://planet.gentoo.org/rss20.xml + + *overlayTextForeground: #FFFF00 + *overlayTextBackground: #000000 +@@ -123,7 +123,8 @@ + + ! The format used for printing the date and time in the password dialog box + ! (see the strftime(3) manual page for details.) +-*dateFormat: %d-%b-%y (%a); %I:%M %p ++!*dateFormat: %d-%b-%y (%a); %I:%M %p ++*dateFormat: %x %X + ! To show the time only: + ! *dateFormat: %I:%M %p + ! For 24 hour time: diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch new file mode 100644 index 0000000..91ce780 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch @@ -0,0 +1,59 @@ +--- a/hacks/barcode.c ++++ a/hacks/barcode.c +@@ -131,7 +131,6 @@ + "children", + "chocolate", + "CLONE", +- "cock", + "constriction", + "contrition", + "cop", +@@ -265,7 +264,6 @@ + "punishment", + "punk rock", + "punk", +- "pussy", + "quagmire", + "quarantine", + "quartz", +@@ -333,8 +331,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.35-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild new file mode 100644 index 0000000..a7554da --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools eutils flag-o-matic multilib pam + +DESCRIPTION="A modular screen saver and locker for the X Window System" +HOMEPAGE="http://www.jwz.org/xscreensaver/"; +SRC_URI=" + http://www.jwz.org/xscreensaver/${P}.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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/gtk+:2 + x11-libs/libX11 + x11-libs/libXext + 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 kde-base/kdm ) ) + ) + opengl? ( + virtual/glu + virtual/opengl + ) + pam? ( virtual/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-proto/recordproto + x11-proto/scrnsaverproto + x11-proto/xextproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto ) +" + +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 + + eapply \ + "${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.28-comment-style.patch \ + "${FILESDIR}"/${PN}-5.31-pragma.patch \ + "${FILESDIR}"/${PN}-5.35-comments.patch \ + "${FILESDIR}"/${PN}-5.35-gentoo.patch + + use offensive || eapply "${FILESDIR}"/${PN}-5.35-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 +}
