Version bump. Use global use flag for setuid screensavers. Use up to date .desktop file from tarball patched to f.d.o desktop entry standard. Pass --with-x-app-defaults to econf instead of moving files around in D. Remove old version.

(Portage version: 2.1.4_rc11)

8 files changed, 84 insertions, 117 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 5300cf5245fb..080f56310d0d 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,19 @@
 # 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.204 2007/11/20 05:25:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.205 2007/12/30 19:39:31 drac Exp $
+
+*xscreensaver-5.04 (30 Dec 2007)
+
+  30 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  -files/xscreensaver-5.02-gdmflexiserver.patch,
+  -files/xscreensaver-5.02-nsfw.patch, -files/xscreensaver-5.02-pam.patch,
+  +files/xscreensaver-5.04-desktop-entry.patch,
+  +files/xscreensaver-5.04-nsfw.patch, -xscreensaver-5.02-r2.ebuild,
+  +xscreensaver-5.04.ebuild:
+  Version bump. Use global use flag for setuid screensavers. Use up to date
+  .desktop file from tarball patched to f.d.o desktop entry standard. Pass
+  --with-x-app-defaults to econf instead of moving files around in D. Remove
+  old version.
 
   20 Nov 2007; Joshua Kinard <kumba@gentoo.org> xscreensaver-5.03.ebuild:
   Stable on mips, per #195253.
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2
deleted file mode 100644
index fdfae96d63a8..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 83937791b30f55f52011d4fee0f5dff3 xscreensaver-5.02.tar.gz 5371759
-RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 xscreensaver-5.02.tar.gz 5371759
-SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d xscreensaver-5.02.tar.gz 5371759
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.04 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.04
new file mode 100644
index 000000000000..94087f25dcdf
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.04
@@ -0,0 +1,3 @@
+MD5 1d27b5ddecdb49c806d1e91ca82fc43e xscreensaver-5.04.tar.gz 5438905
+RMD160 cf8c59a1aff1139c8d205bb734a17bc706f75287 xscreensaver-5.04.tar.gz 5438905
+SHA256 d1200b497795e6e32853e434a81be0cba718a3a46457b378cad7ac9d0dfba6d7 xscreensaver-5.04.tar.gz 5438905
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch
deleted file mode 100644
index 01638d6c2503..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xscreensaver-5.02.orig/configure.in xscreensaver-5.02/configure.in
---- xscreensaver-5.02.orig/configure.in	2007-04-17 07:56:11.000000000 +0300
-+++ xscreensaver-5.02/configure.in	2007-05-11 12:02:20.000000000 +0300
-@@ -2265,7 +2265,7 @@
- 
- have_login_manager=no
- with_login_manager_req=unspecified
--default_login_manager='gdmflexiserver -l'
-+default_login_manager='gdmflexiserver -ls'
- 
- AC_ARG_WITH(login-manager,
- [  --with-login-manager    Put a "New Login" button on the unlock dialog that
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch
deleted file mode 100644
index c4653727b2db..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur xscreensaver-5.02.orig/driver/lock.c xscreensaver-5.02/driver/lock.c
---- xscreensaver-5.02.orig/driver/lock.c	2007-04-20 13:15:56.000000000 +0300
-+++ xscreensaver-5.02/driver/lock.c	2007-06-06 21:48:51.000000000 +0300
-@@ -2066,7 +2066,8 @@
-       }
-     }
- 
--  destroy_passwd_window (si);
-+  if (si->pw_data)
-+    destroy_passwd_window (si);
- }
- 
- 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch
new file mode 100644
index 000000000000..aff293d6e999
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch
@@ -0,0 +1,14 @@
+diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreensaver-5.04/driver/screensaver-properties.desktop.in
+--- xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in	2003-12-15 13:16:12.000000000 +0200
++++ xscreensaver-5.04/driver/screensaver-properties.desktop.in	2007-12-30 21:00:15.000000000 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Exec=xscreensaver-demo
+-Icon=xscreensaver.xpm
++Icon=xscreensaver
+ Terminal=false
+ _Name=Screensaver
+ _Comment=Change screensaver properties
+ Type=Application
+-Categories=Application;Settings;Appearance;AdvancedSettings;
++Categories=Settings;DesktopSettings;Security;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch
index ac7a1cf2b9aa..f56f75d5d764 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch
@@ -1,10 +1,10 @@
-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 @@
- 				fiberlamp -root				    \n\
- 				boxfit -root				    \n\
- 				celtic -root				    \n\
+diff -ur xscreensaver-5.04.orig/driver/XScreenSaver.ad.in xscreensaver-5.04/driver/XScreenSaver.ad.in
+--- xscreensaver-5.04.orig/driver/XScreenSaver.ad.in	2007-11-13 10:36:00.000000000 +0200
++++ xscreensaver-5.04/driver/XScreenSaver.ad.in	2007-12-30 21:13:12.000000000 +0200
+@@ -305,10 +305,6 @@
+ 				cwaves -root				    \n\
+ 				m6502 -root				    \n\
+ 				abstractile -root			    \n\
 -- default-n:			webcollage -root			    \n\
 -- default-n:  "WebCollage (whacked)"					      \
 -				webcollage -root -filter		      \
@@ -12,7 +12,7 @@ diff -ur xscreensaver-5.02.orig/driver/XScreenSaver.ad.in xscreensaver-5.02/driv
  - default-n:			vidwhacker -root			    \n\
  									      \
  @GL_KLUDGE@ GL:			gears -root				    \n\
-@@ -488,7 +484,6 @@
+@@ -495,7 +491,6 @@
  *hacks.xanalogtv.name:      XAnalogTV
  *hacks.xspirograph.name:    XSpiroGraph
  *hacks.nerverot.name:       NerveRot
@@ -20,9 +20,9 @@ diff -ur xscreensaver-5.02.orig/driver/XScreenSaver.ad.in xscreensaver-5.02/driv
  *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
+diff -ur xscreensaver-5.04.orig/hacks/glx/glsnake.c xscreensaver-5.04/hacks/glx/glsnake.c
+--- xscreensaver-5.04.orig/hacks/glx/glsnake.c	2006-05-03 22:39:21.000000000 +0300
++++ xscreensaver-5.04/hacks/glx/glsnake.c	2007-12-30 21:15:41.000000000 +0200
 @@ -565,21 +565,6 @@
  	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
  	ZERO, PIN, ZERO }
@@ -55,10 +55,10 @@ diff -ur xscreensaver-5.02.orig/hacks/glx/glsnake.c xscreensaver-5.02/hacks/glx/
      { "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
-@@ -102,7 +102,7 @@
+diff -ur xscreensaver-5.04.orig/hacks/Makefile.in xscreensaver-5.04/hacks/Makefile.in
+--- xscreensaver-5.04.orig/hacks/Makefile.in	2007-11-13 10:39:36.000000000 +0200
++++ xscreensaver-5.04/hacks/Makefile.in	2007-12-30 21:19:15.000000000 +0200
+@@ -103,7 +103,7 @@
  		  blaster.c bumps.c ripples.c xspirograph.c \
  		  nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
  		  rotzoomer.c whirlygig.c speedmine.c vermiculate.c \
@@ -67,19 +67,19 @@ diff -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefi
  		  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 \
-@@ -110,9 +110,8 @@
- 		  mismunch.c pacman.c pacman_ai.c pacman_level.c \
+@@ -112,9 +112,8 @@
  		  fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
  		  intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
--		  boxfit.c interaggregate.c celtic.c webcollage-cocoa.m \
--		  webcollage-helper-cocoa.m
+ 		  boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \
+-		  asm6502.c abstractile.c \
+-		  webcollage-cocoa.m webcollage-helper-cocoa.m
 -SCRIPTS		= vidwhacker webcollage ljlatest
-+		  boxfit.c interaggregate.c celtic.c
++		  asm6502.c abstractile.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 @@
+@@ -142,7 +141,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 \
@@ -88,18 +88,19 @@ diff -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefi
  		  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 @@
+@@ -150,8 +149,8 @@
  		  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 webcollage-cocoa.o \
--		  webcollage-helper-cocoa.o
-+		  interaggregate.o celtic.o
+-		  interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \
+-		  webcollage-helper-cocoa.o m6502.0 asm6502.o abstractile.o
++		  interaggregate.o celtic.o cwaves.o \
++		  m6502.0 asm6502.o abstractile.o
  
  NEXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
  		  drift flag flame forest vines galaxy grav greynetic halo \
-@@ -173,7 +171,7 @@
- 		  celtic \
+@@ -175,7 +174,7 @@
+ 		  celtic cwaves m6502 abstractile \
  		  @JPEG_EXES@
  SEXES		= sonar
 -JPEG_EXES	= webcollage-helper
@@ -107,7 +108,7 @@ diff -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefi
  EXES		= $(NEXES) $(SEXES)
  
  HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
-@@ -209,7 +207,7 @@
+@@ -211,7 +210,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 \
@@ -116,18 +117,17 @@ diff -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefi
  	          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 @@
+@@ -988,9 +987,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 @@
+@@ -2521,17 +2517,6 @@
  wander.o: $(UTILS_SRC)/usleep.h
  wander.o: $(UTILS_SRC)/visual.h
  wander.o: $(UTILS_SRC)/yarandom.h
@@ -145,12 +145,12 @@ diff -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefi
  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
+diff -ur xscreensaver-5.04.orig/po/POTFILES.in xscreensaver-5.04/po/POTFILES.in
+--- xscreensaver-5.04.orig/po/POTFILES.in	2007-11-13 10:39:40.000000000 +0200
++++ xscreensaver-5.04/po/POTFILES.in	2007-12-30 21:19:50.000000000 +0200
+@@ -210,7 +210,6 @@
  hacks/config/vines.xml
+ hacks/config/voronoi.xml
  hacks/config/wander.xml
 -hacks/config/webcollage.xml
  hacks/config/whirlwindwarp.xml
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.04.ebuild
index fcb1509db07c..5264f063c7e0 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.04.ebuild
@@ -1,6 +1,6 @@
 # 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.02-r2.ebuild,v 1.13 2007/06/27 06:02:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04.ebuild,v 1.1 2007/12/30 19:39:31 drac Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -10,8 +10,8 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="jpeg new-login offensive opengl pam suid xinerama"
 
 RDEPEND="x11-libs/libXxf86misc
 	x11-apps/xwininfo
@@ -43,12 +43,13 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-gdmflexiserver.patch
-	epatch "${FILESDIR}"/${P}-pam.patch
+	epatch "${FILESDIR}"/${PN}-5.02-gentoo.patch
+
+	# Update spec. using desktop-file-validate.
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
 
 	# disable offensive screensavers.
-	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
+	use offensive || epatch "${FILESDIR}"/${P}-nsfw.patch
 
 	eautoreconf
 
@@ -64,6 +65,7 @@ src_compile() {
 
 	unset BC_ENV_ARGS
 	econf \
+		--with-x-app-defaults=/usr/share/X11/app-defaults \
 		--with-hackdir=/usr/lib/misc/xscreensaver \
 		--with-configdir=/usr/share/xscreensaver/config \
 		--x-libraries=/usr/$(get_libdir) \
@@ -79,58 +81,31 @@ src_compile() {
 		--with-gtk \
 		--without-kerberos \
 		--without-gle \
-		$(use_with insecure-savers setuid-hacks) \
+		$(use_with suid 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
+	# Fix 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"
+	# 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"
+	mv "${D}"/usr/share/man/man6/worm.6 \
+		"${D}"/usr/share/man/man6x/worm.6x
 }
 
 pkg_postinst() {
@@ -144,14 +119,4 @@ pkg_postinst() {
 		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
 }