Version bump wrt #212060, thanks to Tobias Klausmann for reporting.

(Portage version: 2.1.4.4)

4 files changed, 64 insertions, 22 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 35ceab9e6945..75548186ac26 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.222 2008/02/28 15:54:29 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.223 2008/03/02 14:45:27 drac Exp $
+
+*xscreensaver-5.05 (02 Mar 2008)
+
+  02 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xscreensaver-5.05-desktop-entry.patch,
+  +files/xscreensaver-5.05-posix-head.patch, -xscreensaver-5.04.ebuild,
+  +xscreensaver-5.05.ebuild:
+  Version bump wrt #212060, thanks to Tobias Klausmann for reporting.
 
   28 Feb 2008; Samuli Suominen <drac@gentoo.org>
   xscreensaver-5.04-r1.ebuild:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch
new file mode 100644
index 000000000000..f0e9b90cdd75
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-desktop-entry.patch
@@ -0,0 +1,29 @@
+diff -ur xscreensaver-5.05.orig/driver/Makefile.in xscreensaver-5.05/driver/Makefile.in
+--- xscreensaver-5.05.orig/driver/Makefile.in	2008-03-02 07:34:46.000000000 +0200
++++ xscreensaver-5.05/driver/Makefile.in	2008-03-02 16:07:29.000000000 +0200
+@@ -498,7 +498,7 @@
+ 	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+ 	   fi								     ;\
+-	   name2=gnome-screensaver-properties.desktop			     ;\
++	   name2=xscreensaver-properties.desktop			     ;\
+ 	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
+ 		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+ 		$(INSTALL_DATA) screensaver-properties.desktop		      \
+@@ -571,7 +571,7 @@
+ # into /usr/share/applications/
+ uninstall-gnome::
+ 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
+-          f=gnome-screensaver-properties.desktop                             ;\
++          f=xscreensaver-properties.desktop                             ;\
+           echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
+                rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
+         fi
+diff -ur xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in xscreensaver-5.05/driver/screensaver-properties.desktop.in
+--- xscreensaver-5.05.orig/driver/screensaver-properties.desktop.in	2008-01-27 01:16:59.000000000 +0200
++++ xscreensaver-5.05/driver/screensaver-properties.desktop.in	2008-03-02 16:08:00.000000000 +0200
+@@ -6,3 +6,4 @@
+ _Comment=Change screensaver properties
+ Type=Application
+ Categories=Settings;DesktopSettings;Security;
++NotShowIn=GNOME;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch
new file mode 100644
index 000000000000..d282e78e2e44
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-posix-head.patch
@@ -0,0 +1,12 @@
+diff -ur xscreensaver-5.05.orig/Makefile.in xscreensaver-5.05/Makefile.in
+--- xscreensaver-5.05.orig/Makefile.in	2008-03-01 06:32:52.000000000 +0200
++++ xscreensaver-5.05/Makefile.in	2008-03-02 16:27:25.000000000 +0200
+@@ -326,7 +326,7 @@
+   diff -U0 download.html $$TMP ;					    \
+   echo '' ;								    \
+ 									    \
+-  OLDEST=`ls xscreensaver*.tar.gz | head -1` ;				    \
++  OLDEST=`ls xscreensaver*.tar.gz | head -n 1` ;			    \
+   /bin/echo -n "Delete $$DEST/$$OLDEST? ";				    \
+   read line;								    \
+   if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then			    \
diff --git a/x11-misc/xscreensaver/xscreensaver-5.04.ebuild b/x11-misc/xscreensaver/xscreensaver-5.05.ebuild
index e3d8bec830f7..9d1f378cc332 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.05.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04.ebuild,v 1.9 2008/02/07 15:05:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.1 2008/03/02 14:45:27 drac Exp $
 
-inherit autotools eutils fixheadtails flag-o-matic pam
+inherit eutils flag-o-matic multilib pam
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="jpeg new-login opengl pam suid xinerama"
 
 RDEPEND="x11-libs/libXxf86misc
@@ -35,26 +35,20 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext
 	dev-util/intltool
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-proto/xineramaproto )
+	!x11-misc/fireflies"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	# Gentoo specific hacks and settings.
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-nsfw.patch
-
+	epatch "${FILESDIR}"/${PN}-5.04-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.04-nsfw.patch
 	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-
-	eautoreconf
-
-	# TODO. Get this fixed upstream.
-	ht_fix_all
+	epatch "${FILESDIR}"/${P}-posix-head.patch
 }
 
 src_compile() {
-	# Simple workaround for the flurry screensaver. Still needed for 5.04.
+	# Simple workaround for the ppc* arches flurry screensaver, needed for <=5.04
 	filter-flags -mabi=altivec
 	filter-flags -maltivec
 	append-flags -U__VEC__
@@ -63,8 +57,8 @@ src_compile() {
 
 	econf \
 		--with-x-app-defaults=/usr/share/X11/app-defaults \
-		--with-hackdir=/usr/lib/misc/xscreensaver \
-		--with-configdir=/usr/share/xscreensaver/config \
+		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir=/usr/share/${PN}/config \
 		--x-libraries=/usr/$(get_libdir) \
 		--x-includes=/usr/include \
 		--with-dpms-ext \
@@ -94,12 +88,11 @@ src_install() {
 
 	dodoc README*
 
-	use pam && fperms 755 /usr/bin/xscreensaver
-	pamd_mimic_system xscreensaver auth
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
 
 	# Bug 135549.
-	rm -f "${D}"/usr/share/xscreensaver/config/electricsheep.xml
-	rm -f "${D}"/usr/share/xscreensaver/config/fireflies.xml
+	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 	dodir /usr/share/man/man6x
 	mv "${D}"/usr/share/man/man6/worm.6 \
 		"${D}"/usr/share/man/man6x/worm.6x