update to latest, 5.03

(Portage version: 2.1.2.7)

4 files changed, 315 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index fc29eaaf2a7e..603f557013a9 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.195 2007/06/27 06:02:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.196 2007/07/17 15:09:12 smithj Exp $
+
+*xscreensaver-5.03 (17 Jul 2007)
+
+  17 Jul 2007; <smithj@gentoo.org> +files/xscreensaver-5.03-nsfw.patch,
+  +xscreensaver-5.03.ebuild:
+  update to 5.03, the latest; note that ${P}-gdmflexiserver.patch and
+  ${P}-pam.patch have been pushed upstream
 
   27 Jun 2007; Markus Rothe <corsair@gentoo.org>
   xscreensaver-5.02-r2.ebuild:
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.03 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.03
new file mode 100644
index 000000000000..85427c5431b8
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.03
@@ -0,0 +1,3 @@
+MD5 367b0397132102faf43e71e27bbdc181 xscreensaver-5.03.tar.gz 5412089
+RMD160 f28aca829982c9b9b1989f03309e48fdbdc8e2de xscreensaver-5.03.tar.gz 5412089
+SHA256 82ad32523f5e6b8c8b6431aac4474f2bfde9d4cf70caec9446ed900f48887d26 xscreensaver-5.03.tar.gz 5412089
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.03-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.03-nsfw.patch
new file mode 100644
index 000000000000..86d3c5da750c
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.03-nsfw.patch
@@ -0,0 +1,149 @@
+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 @@
+ 				celtic -root				    \n\
+ 				cwaves -root				    \n\
+ 				m6502 -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
+@@ -110,9 +110,8 @@
+ 		  fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
+ 		  intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
+ 		  boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \
+-		  asm6502.c \
+-		  webcollage-cocoa.m webcollage-helper-cocoa.m
+-SCRIPTS		= vidwhacker webcollage ljlatest
++		  asm6502.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 cwaves.o webcollage-cocoa.o \
+-		  webcollage-helper-cocoa.o m6502.0 asm6502.o
++		  interaggregate.o celtic.o cwaves.o m6502.0 asm6502.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.03.ebuild b/x11-misc/xscreensaver/xscreensaver-5.03.ebuild
new file mode 100644
index 000000000000..b4ded9e8ad48
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.03.ebuild
@@ -0,0 +1,155 @@
+# 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.03.ebuild,v 1.1 2007/07/17 15:09:12 smithj Exp $
+
+inherit eutils flag-o-matic pam fixheadtails autotools
+
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome jpeg insecure-savers new-login offensive opengl pam xinerama"
+
+RDEPEND="x11-libs/libXxf86misc
+	x11-apps/xwininfo
+	x11-apps/appres
+	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 )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	new-login? ( gnome-base/gdm )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/scrnsaverproto
+	x11-proto/recordproto
+	x11-proto/xf86miscproto
+	sys-devel/bc
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/xscreensaver-5.02-gentoo.patch"
+
+	# disable offensive screensavers.
+	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
+
+	eautoreconf
+
+	# change head and tail calls to POSIX ones.
+	ht_fix_all
+}
+
+src_compile() {
+	# simple workaround for the flurry screensaver
+	filter-flags -mabi=altivec
+	filter-flags -maltivec
+	append-flags -U__VEC__
+
+	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-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-proc-interrupts \
+		--with-xpm \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		--with-gtk \
+		--without-kerberos \
+		--without-gle \
+		$(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 jpeg)
+
+	# bug 155049
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	[[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
+
+	emake install_prefix="${D}" install || die "emake 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
+
+		newicon "${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"
+
+	# Allways install Settings .desktop for enviroments following
+	# freedesktop.org standard, e.g. xfce-base/xfdesktop and rox-base/xdg-menu
+	domenu "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
+
+	use pam && fperms 755 /usr/bin/xscreensaver
+	pamd_mimic_system xscreensaver auth
+
+	# Fix bug #135549:
+	rm -f "${D}/usr/share/xscreensaver/config/electricsheep.xml"
+	rm -f "${D}/usr/share/xscreensaver/config/fireflies.xml"
+	dodir /usr/share/man/man6x
+	mv "${D}/usr/share/man/man6/worm.6" \
+		"${D}/usr/share/man/man6x/worm.6x"
+
+	# Fix bug #152250:
+	dodir "/usr/share/X11/app-defaults"
+	mv "${D}/usr/lib/X11/app-defaults/XScreenSaver" \
+		"${D}/usr/share/X11/app-defaults/XScreenSaver"
+}
+
+pkg_postinst() {
+	if ! use new-login; then
+		elog
+		elog "You have chosen to not use the new-login USE flag."
+		elog "This is a new USE flag which enables individuals to"
+		elog "create new logins when the screensaver is active,"
+		elog "allowing others to use their account, even though the"
+		elog "screen is locked to another account. If you want this"
+		elog "feature, please recompile with USE=\"new-login\"."
+		elog
+	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 privileges. You have been warned."
+		ewarn
+	fi
+}