removed yelp dependency; norpm patch merged with new configure patch; fixed gnome-terminal problem for #94708; fixed default local setting problem for #96914; changed hackdir to something more suitable; used new X11 library paths; amd64-multilib fixes; more pam fixes; ebuild cleanup; MUCH THANKS to Octavio Ruiz <tacvbo@tacvbo.net> for the patches

(Portage version: 2.0.51.22-r1)

7 files changed, 306 insertions, 12 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index fe464b9bc38c..21c91243399c 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.89 2005/06/23 22:48:39 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.90 2005/06/24 23:09:16 smithj Exp $
+
+*xscreensaver-4.22-r1 (24 Jun 2005)
+
+  24 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+  +xscreensaver-4.22-r1.ebuild:
+  removed yelp dependency; norpm patch merged with new configure patch; fixed
+  gnome-terminal problem for #94708; fixed default local setting problem for
+  #96914; changed hackdir to something more suitable; used new X11 library
+  paths; amd64-multilib fixes; more pam fixes; ebuild cleanup; MUCH THANKS to
+  Octavio Ruiz <tacvbo@tacvbo.net> for the patches
 
 *xscreensaver-4.22 (23 Jun 2005)
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 526e59ec7f17..f645abad9511 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1394e4bb4a7ef2463ed16a3d6e1e6195 xscreensaver-4.20.ebuild 4836
 MD5 f9e4d478fa668b28e05c77b33ff4d3ad xscreensaver-4.21.ebuild 4637
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 c0f94e55889ac9d62ea23e5690bd49db xscreensaver-4.22.ebuild 4873
 MD5 9b75f02ad6d2e359cab3b1d17412dacd xscreensaver-4.20-r1.ebuild 4462
-MD5 8f8a0169ebf8e31ec8e931e3fddacf87 ChangeLog 15587
+MD5 c86202288d67c5f545ac47a24cc124f8 ChangeLog 16066
+MD5 5c21f1b7147141fae65d4f46f18a16bb xscreensaver-4.22-r1.ebuild 4813
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20-r1 70
 MD5 c4ec3ad074fd83aff37b4b4ddc9b7f61 files/digest-xscreensaver-4.21 70
@@ -18,11 +16,8 @@ MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
 MD5 a719b7c6d25874293342a3f22d69d8e4 files/xscreensaver-4.21-norpm.patch 1290
 MD5 d51a7f89b409fa5d58c228856b927993 files/xscreensaver-4.21-settings.patch 1162
 MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22 70
+MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 1592
+MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
+MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
+MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r1 70
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCuz1cl5AvwDPiUowRAv3CAJ9ao/zQAqY/DAWMypXTmRndFErSAACdHDlN
-JQ1BVX26PsR4bbPKeoH5QeI=
-=8Z3I
------END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r1
new file mode 100644
index 000000000000..6f0f6e359c66
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r1
@@ -0,0 +1 @@
+MD5 9f37c428f034e581026e243445378195 xscreensaver-4.22.tar.gz 4620066
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-configure.patch
new file mode 100644
index 000000000000..3212c43fa949
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.22-configure.patch
@@ -0,0 +1,46 @@
+--- configure.orig	2005-06-23 15:47:02.000000000 -0500
++++ configure	2005-06-23 16:41:34.000000000 -0500
+@@ -14728,7 +14728,7 @@
+ # Check for the various Gnome help and URL loading programs.
+ #
+ if test "$have_gtk" = yes; then
+-  for ac_prog in gnome-open
++  for ac_prog in gnome-terminal
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -21519,34 +21519,6 @@
+ 
+   # M4 sucks!!
+ 
+-  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
+-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
+-        head -1`
+-
+-
+-  if test \! -z "$rpmv" ; then
+-    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
+-    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'`
+-
+-    warning=no
+-    warnL "There is already an installed RPM of xscreensaver $rpmv"
+-    warn2 'on this system.  You might want to remove it ("rpm -ve")'
+-    warn2 'before running "make install" in this directory.'
+-    echo ""
+-    warn2 "Alternately, you could build this version of xscreensaver"
+-    warn2 'as an RPM, and then install that.  An "xscreensaver.spec"'
+-    warn2 'file is included.  Try "rpmbuild -v -ba xscreensaver.spec".'
+-    warn2 "See the RPM documentation for more info."
+-    echo ""
+-
+-    if test "$rpmbdir" = "$rpmhdir" ; then
+-      warn2 "The RPM version was installed in $rpmbdir/."
+-      do_dir_warning=yes
+-    else
+-      warn2 "The RPM version was installed in $rpmbdir/,"
+-      warn2 "with demos in $rpmhdir/."
+-    fi
+-  fi
+ fi
+ 
+ if test "${bindir}" = "${HACKDIR}" ; then
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-interaggregate.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-interaggregate.patch
new file mode 100644
index 000000000000..867e9aed47da
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.22-interaggregate.patch
@@ -0,0 +1,11 @@
+--- hacks/config/interaggregate.xml.orig	2005-06-21 21:16:01.000000000 -0500
++++ hacks/config/interaggregate.xml	2005-06-23 16:22:12.000000000 -0500
+@@ -7,7 +7,7 @@
+   <number id="init" type="spinbutton" arg="-num-discs %"
+           _label="Number of Discs" low="50" high="400" default="85"/>
+ 
+-  <number id="speed" type="slider" arg="-draw-delay %"
++  <number id="speed" type="slider" arg="-growth-delay %"
+           _label="Speed" _low-label="Slow" _high-label="Fast"
+           low="0" high="60000" default="30000" convert="invert"/>
+ 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.22-settings.patch b/x11-misc/xscreensaver/files/xscreensaver-4.22-settings.patch
new file mode 100644
index 000000000000..9744dbeba44b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.22-settings.patch
@@ -0,0 +1,65 @@
+--- driver/XScreenSaver.ad.in.orig	2005-06-24 17:22:15.000000000 -0500
++++ driver/XScreenSaver.ad.in	2005-06-24 17:43:23.000000000 -0500
+@@ -31,19 +31,19 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:20:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
+-*dpmsStandby:		2:00:00
+-*dpmsSuspend:		2:00:00
+-*dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*dpmsEnabled:		True
++*dpmsStandby:		1:00:00
++*dpmsSuspend:		1:00:00
++*dpmsOff:		2:00:00
++*grabDesktopImages:	False
+ *grabVideoFrames:	False
+ *chooseRandomImages:	@DEFAULT_IMAGES_P@
+ *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
+ *nice:			10
+ *memoryLimit:		0
+-*lock:			False
++*lock:			True
+ *lockVTs:		True
+ *verbose:		False
+ *timestamp:		True
+@@ -51,17 +51,17 @@
+ *unfade:		False
+ *fadeSeconds:		0:00:03
+ *fadeTicks:		20
+-*splash:		True
++*splash:		False
+ *splashDuration:	0:00:05
+ *visualID:		default
+ *captureStderr: 	True
+ *ignoreUninstalledPrograms: False
+ 
+-*textMode:		file
+-*textLiteral:		XScreenSaver
+-*textFile:		@DEFAULT_TEXT_FILE@
+-*textProgram:		fortune
+-*textURL:		http://www.livejournal.com/stats/latest-rss.bml
++*textMode:		literal
++*textLiteral:		Gentoo Linux
++*textFile:		/etc/gentoo-release
++*textProgram:		/usr/bin/fortune
++*textURL:		http://planet.gentoo.org/rss20.xml
+ 
+ *overlayTextForeground:	#FFFF00
+ *overlayTextBackground:	#000000
+@@ -118,7 +118,10 @@
+ 
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat:		%d-%b-%y (%a); %I:%M %p
++! Preferred time representation for the current locale
++*dateFormat:    %x %X
++! Xscreensaver's default
++! *dateFormat:		%d-%b-%y (%a); %I:%M %p
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r1.ebuild
new file mode 100644
index 000000000000..077fb677df7a
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.22-r1.ebuild
@@ -0,0 +1,166 @@
+# 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.22-r1.ebuild,v 1.1 2005/06/24 23:09:16 smithj Exp $
+
+inherit eutils flag-o-matic pam
+
+IUSE="gnome gtk jpeg kerberos krb4 motif 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
+
+RDEPEND="virtual/x11
+	media-libs/netpbm
+	>=sys-libs/zlib-1.1.4
+	gtk? (
+		>=dev-libs/libxml2-2.5
+		>=x11-libs/gtk+-2
+		>=gnome-base/libglade-1.99
+		>=dev-libs/glib-2
+	)
+	motif? ( x11-libs/openmotif )
+	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 )"
+		#gnome? ( gnome-base/gdm )
+
+DEPEND="${RDEPEND}
+	sys-devel/bc
+	dev-lang/perl
+	gtk? ( 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 gtk ; then
+		if use motif ; then
+			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"
+			ewarn "version is no longer being maintained), so xscreensaver-demo will not"
+			ewarn "be built.  This is most likely NOT what you want."
+		fi
+		ewarn
+		epause
+	fi
+	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
+}
+
+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
+	# 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
+}
+
+src_compile() {
+	local myconf=""
+
+	if use gtk ; then
+		myconf="${myconf} --without-motif --with-gtk --with-xml"
+	elif use motif; then
+		myconf="${myconf} --with-motif --without-gtk --without-pixbuf"
+	else
+		myconf="${myconf} --without-motif --without-gtk --without-pixbuf"
+	fi
+
+	use gnome || has_version gnome-base/gdm \
+		&& myconf="${myconf} --with-login-manager" \
+		|| myconf="${myconf} --without-login-manager"
+
+	use kerberos && use krb4 \
+		&& myconf="${myconf} --with-kerberos" \
+		|| myconf="${myconf} --without-kerberos"
+
+	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 \
+		$(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 gnome2
+	if use gnome ; then
+		dodir /usr/share/gnome/capplets
+		insinto /usr/share/gnome/capplets
+		doins driver/screensaver-properties.desktop
+	fi
+
+	# install symlink to satisfy kde
+	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
+
+	if use gnome ; then
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	fi
+
+	use pam && fperms 755 /usr/bin/xscreensaver
+	pamd_mimic_system xscreensaver auth
+}