[patch] xscreensaver-4.21-4.22.diff

xscreensaver-4.21-4.22.diff (text/plain), 4.47 KB, created by Octavio Ruiz (Ta^3) on 2005-06-23 17:42:32 UTC

--- /usr/portage/x11-misc/xscreensaver/xscreensaver-4.21.ebuild	2005-05-27 16:26:07.000000000 -0500
+++ /usr/local/portage/x11-misc/xscreensaver/xscreensaver-4.22.ebuild	2005-06-23 19:36:35.000000000 -0500
@@ -1,12 +1,12 @@
 # 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.21.ebuild,v 1.1 2005/05/27 21:26:07 rizzo Exp $
+# $Header: $
 
 inherit eutils flag-o-matic pam
 
-IUSE="pam kerberos krb4 gtk gnome opengl jpeg xinerama offensive motif"
+IUSE="gnome gtk jpeg kerberos krb4 motif offensive opengl pam xinerama"
 
-DESCRIPTION="a modular screensaver for X11"
+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/"
 
@@ -26,7 +26,6 @@
 		>=x11-libs/gtk+-2
 		>=gnome-base/libglade-1.99
 		>=dev-libs/glib-2
-		gnome? ( >=gnome-extra/yelp-2 )
 	)
 	motif? ( x11-libs/openmotif )
 	pam? ( virtual/pam )
@@ -34,7 +33,7 @@
 	jpeg? ( media-libs/jpeg )
 	opengl? ( virtual/opengl
 	          >=media-libs/gle-3.0.1 )"
-		#gnome? ( >=gnome-extra/yelp-2 gnome-base/gdm )
+		#gnome? ( gnome-base/gdm )
 
 DEPEND="${RDEPEND}
 	sys-devel/bc
@@ -50,13 +49,15 @@
 pkg_setup() {
 	if ! use gtk ; then
 		if use motif ; then
-			ewarn 'From the configure script:'
-			ewarn '  Though the Motif front-end to xscreensaver is still'
-			ewarn '  maintained, it is no longer being updated with new'
-			ewarn '  features: all new development on the xscreensaver-demo'
-			ewarn '  program is happening in the GTK version, and not in the'
-			ewarn '  Motif version.'
-			ewarn 'It is recommended that you use the "gtk" USE flag.'
+			ewarn "From the configure script:"
+			ewarn
+			ewarn "  Though the Motif front-end to xscreensaver is still"
+			ewarn "  maintained, it is no longer being updated with new"
+			ewarn "  features: all new development on the xscreensaver-demo"
+			ewarn "  program is happening in the GTK version, and not in the"
+			ewarn "  Motif version."
+			ewarn
+			ewarn "It is recommended that you use the \"gtk\" USE flag."
 		else
 			ewarn "You have enabled neither gtk nor motif USE flags.  xscreensaver-demo"
 			ewarn "requires either GTK+ 2 or Motif (GTK+ 2 is recommended, as the Motif"
@@ -70,7 +71,7 @@
 		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
 		ewarn " USE=\"krb4\" emerge mit-krb5"
 		ewarn
 		epause
@@ -82,9 +83,12 @@
 
 	cd ${S}
 	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	epatch ${FILESDIR}/${PN}-4.21-norpm.patch
+	# 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.21-settings.patch
+	epatch ${FILESDIR}/${PN}-4.22-settings.patch
+	# fixes wrong argument for inter-aggregate screensaver
+	epatch ${FILESDIR}/${PN}-4.22-interaggregate.patch
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
 }
@@ -109,10 +113,10 @@
 		|| myconf="${myconf} --without-kerberos"
 
 	econf \
-		--with-hackdir=/usr/lib/xscreensaver \
+		--with-hackdir=/usr/lib/misc/xscreensaver \
 		--with-configdir=/usr/share/xscreensaver/config \
-		--x-libraries=/usr/X11R6/lib \
-		--x-includes=/usr/X11R6/include \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
 		--with-mit-ext \
 		--with-dpms-ext \
 		--with-xf86vmode-ext \
@@ -124,6 +128,7 @@
 		--enable-locking \
 		$(use_with xinerama xinerama-ext) \
 		$(use_with pam) \
+		$(use_with pam pam-service-name=xscreensaver) \
 		$(use_with opengl gl) $(use_with opengl gle) \
 		$(use_with jpeg) \
 		$(use_enable nls) \
@@ -137,7 +142,10 @@
 
 	make install_prefix="${D}" install || die
 
+	use pam && fperms 755 /usr/bin/xscreensaver
+
 	dodoc README
+	cp ${FILESDIR}/gentoo-philosophy ${D}/usr/share/${PN}
 
 	# install correctly in gnome2
 	if use gnome ; then
@@ -147,7 +155,7 @@
 	fi
 
 	# install symlink to satisfy kde
-	use kde && dosym /usr/share/xscreensaver/config /usr/lib/xscreensaver/config
+	use kde && dosym /usr/share/xscreensaver/config /usr/$(get_libdir)/xscreensaver/config
 
 	# Remove "extra" capplet
 	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop