--- /dev/null
+diff -Nru xscreensaver-4.23/driver/XScreenSaver.ad.in xscreensaver-4.23.nsfw/driver/XScreenSaver.ad.in
+--- xscreensaver-4.23/driver/XScreenSaver.ad.in 2005-10-22 06:50:00.000000000 +0200
++++ xscreensaver-4.23.nsfw/driver/XScreenSaver.ad.in 2005-10-30 17:26:01.000000000 +0100
+@@ -318,10 +318,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\
+@@ -508,7 +504,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.23/driver/XScreenSaver_ad.h xscreensaver-4.23.nsfw/driver/XScreenSaver_ad.h
+--- xscreensaver-4.23/driver/XScreenSaver_ad.h 2005-10-22 08:43:56.000000000 +0200
++++ xscreensaver-4.23.nsfw/driver/XScreenSaver_ad.h 2005-10-30 17:26:30.000000000 +0100
+@@ -219,10 +219,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: gears -root \\n\
+@@ -379,7 +375,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.23/hacks/Makefile.in xscreensaver-4.23.nsfw/hacks/Makefile.in
+--- xscreensaver-4.23/hacks/Makefile.in 2005-10-22 08:43:59.000000000 +0200
++++ xscreensaver-4.23.nsfw/hacks/Makefile.in 2005-10-30 17:27:29.000000000 +0100
+@@ -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 celtic.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 \
+@@ -162,7 +162,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 \
+@@ -198,7 +198,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 \
+@@ -1467,7 +1467,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.23/hacks/glx/glsnake.c xscreensaver-4.23.nsfw/hacks/glx/glsnake.c
+--- xscreensaver-4.23/hacks/glx/glsnake.c 2005-03-07 03:31:18.000000000 +0100
++++ xscreensaver-4.23.nsfw/hacks/glx/glsnake.c 2005-10-30 17:24:47.000000000 +0100
+@@ -547,21 +547,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,
+@@ -973,9 +958,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 }
+ },
+- { "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 }
+ },
+diff -Nru xscreensaver-4.23/po/POTFILES.in xscreensaver-4.23.nsfw/po/POTFILES.in
+--- xscreensaver-4.23/po/POTFILES.in 2005-10-22 08:44:11.000000000 +0200
++++ xscreensaver-4.23.nsfw/po/POTFILES.in 2005-10-30 17:27:37.000000000 +0100
+@@ -200,7 +200,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
--- /dev/null
+# 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.23.ebuild,v 1.1 2005/10/30 16:42:38 nelchael Exp $
+
+inherit eutils flag-o-matic pam fixheadtails
+
+IUSE="gnome jpeg kerberos krb4 insecure-savers new-login nls offensive opengl pam xinerama"
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+
+# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
+# really matter if it isn't there. Maybe we should have a 'games'
+# USE flag...
+
+# smithj says (2005-07-26):
+# MOTIF WAS REMOVED FOR A REASON! The motif version has not been maintained for
+# some time, and has problems both at build-time and run-time. This ebuild
+# (4.22-r3) is going to force gtk support and disable motif support. Hopefully
+# the users won't complain too much...
+
+RDEPEND="virtual/x11
+ media-libs/netpbm
+ >=sys-libs/zlib-1.1.4
+ >=dev-libs/libxml2-2.5
+ >=x11-libs/gtk+-2
+ >=gnome-base/libglade-1.99
+ >=dev-libs/glib-2
+ pam? ( virtual/pam )
+ kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
+ jpeg? ( media-libs/jpeg )
+ opengl? ( virtual/opengl
+ >=media-libs/gle-3.0.1 )
+ !arm? ( new-login? ( gnome-base/gdm ) )"
+
+DEPEND="${RDEPEND}
+ sys-devel/bc
+ dev-lang/perl
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+# simple workaround for the flurry screensaver
+filter-flags -mabi=altivec
+filter-flags -maltivec
+append-flags -U__VEC__
+
+pkg_setup() {
+ if use kerberos && ! use krb4 ; then
+ ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
+ ewarn "disabled unless kerberos 4 support has been compiled with your"
+ ewarn "kerberos libraries. To do that, you should abort now and do:"
+ ewarn
+ ewarn " USE=\"krb4\" emerge mit-krb5"
+ ewarn
+ epause
+ fi
+ if use arm && use new-login; then
+ ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
+ ewarn "available for the arm platform. please disable this use flag"
+ die "new-login USE is not supported on arm"
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
+ # use gnome-terminal in tests rather than gnome-open (bug #94708)
+ epatch ${FILESDIR}/${PN}-4.22-configure.patch
+
+ # tweaks the default configuration (driver/XScreenSaver.ad.in)
+ epatch ${FILESDIR}/${PN}-4.22-settings.patch
+
+ # makes the blank screen REALLY blank
+ epatch ${FILESDIR}/${PN}-blank-screen.patch
+
+ # disable not-safe-for-work xscreensavers
+ use offensive || epatch ${FILESDIR}/${PN}-4.23-nsfw.patch
+
+ # change old head/tail to POSIX ones
+ #cd hacks
+ ht_fix_all
+}
+
+src_compile() {
+ local myconf
+ use kerberos && use krb4 \
+ && myconf="${myconf} --with-kerberos" \
+ || myconf="${myconf} --without-kerberos"
+
+ unset BC_ENV_ARGS
+ econf \
+ --with-hackdir=/usr/lib/misc/xscreensaver \
+ --with-configdir=/usr/share/xscreensaver/config \
+ --x-libraries=/usr/$(get_libdir) \
+ --x-includes=/usr/include \
+ --with-mit-ext \
+ --with-dpms-ext \
+ --with-xf86vmode-ext \
+ --with-xf86gamma-ext \
+ --with-proc-interrupts \
+ --with-xpm \
+ --with-xshm-ext \
+ --with-xdbe-ext \
+ --enable-locking \
+ --with-gtk \
+ --with-xml \
+ $(use_with insecure-savers setuid-hacks) \
+ $(use_with new-login login-manager) \
+ $(use_with xinerama xinerama-ext) \
+ $(use_with pam) \
+ $(use_with opengl gl) $(use_with opengl gle) \
+ $(use_with jpeg) \
+ $(use_enable nls) \
+ ${myconf} || die "econf failed"
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ [ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
+
+ make install_prefix="${D}" install || die "make install failed"
+
+ dodoc README
+
+ # install correctly in gnome, including info about configuration preferences
+ if use gnome ; then
+ dodir /usr/share/gnome/capplets
+ insinto /usr/share/gnome/capplets
+ doins driver/screensaver-properties.desktop
+
+ dodir /usr/share/pixmaps
+ insinto /usr/share/pixmaps
+ newins ${S}/utils/images/logo-50.xpm
+ xscreensaver.xpm
+
+ dodir /usr/share/control-center-2.0/capplets
+ insinto /usr/share/control-center-2.0/capplets
+ newins ${FILESDIR}/desktop_entries/screensaver-properties.desktop
+ fi
+
+ # Remove "extra" capplet
+ rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
+
+ use pam && fperms 755 /usr/bin/xscreensaver
+ pamd_mimic_system xscreensaver auth
+}
+
+pkg_postinst() {
+ if ! use new-login; then
+ einfo
+ einfo "You have chosen to not use the new-login USE flag."
+ einfo "This is a new USE flag which enables individuals to"
+ einfo "create new logins when the screensaver is active,"
+ einfo "allowing others to use their account, even though the"
+ einfo "screen is locked to another account. If you want this"
+ einfo "feature, please recompile with USE=\"new-login\"."
+ einfo
+ fi
+
+ if use insecure-savers;then
+ ewarn
+ ewarn "You have chosen USE=insecure-savers. While upstream"
+ ewarn "has made every effort to make sure these savers do not"
+ ewarn "abuse their setuid root status, the possibilty exists that"
+ ewarn "someone will exploit xscreensaver and will be able to gain"
+ ewarn "root privledges. You have been warned."
+ ewarn
+ fi
+
+ einfo
+ einfo "The gtk USE flag has been dropped. gtk is now required for Gentoo's"
+ einfo "xscreensaver. If this is a problem, bug upstream."
+ einfo
+}
projects / gentoo.git / commitdiff