Version bump, closes bug #86102. Thanks to Ryan Finnie and Octavio Ruiz

(Portage version: 2.0.51.22-r1)

5 files changed, 250 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index eaf79db58ca7..cdd30d5644a6 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.84 2005/05/27 20:19:36 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.85 2005/05/27 21:26:07 rizzo Exp $
+
+*xscreensaver-4.21 (27 May 2005)
+
+  27 May 2005; Don Seiler <rizzo@gentoo.org>
+  +files/xscreensaver-4.21-norpm.patch,
+  +files/xscreensaver-4.21-settings.patch, +xscreensaver-4.21.ebuild:
+  Version bump, closes bug #86102.  Thanks to Ryan Finnie and Octavio Ruiz
 
   27 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
   xscreensaver-4.20.ebuild:
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.21 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.21
new file mode 100644
index 000000000000..8be5d1ac30fa
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.21
@@ -0,0 +1 @@
+MD5 3ea7d0bc9b7159523855296e175d7ac7 xscreensaver-4.21.tar.gz 4519828
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch
new file mode 100644
index 000000000000..084c83a77056
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.21-norpm.patch
@@ -0,0 +1,37 @@
+--- configure.orig	2005-05-27 13:09:59.000000000 -0500
++++ configure	2005-05-27 13:10:56.000000000 -0500
+@@ -21257,34 +21257,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.21-settings.patch b/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch
new file mode 100644
index 000000000000..f300c1b83871
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.21-settings.patch
@@ -0,0 +1,43 @@
+--- driver/XScreenSaver.ad.in.orig	2005-05-27 14:10:59.000000000 -0500
++++ driver/XScreenSaver.ad.in	2005-05-27 14:10:46.000000000 -0500
+@@ -31,19 +31,19 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:15:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
++*dpmsEnabled:		True
+ *dpmsStandby:		2:00:00
+ *dpmsSuspend:		2:00:00
+ *dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*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
+@@ -57,11 +57,11 @@
+ *captureStderr: 	True
+ *ignoreUninstalledPrograms: False
+ 
+-*textMode:		file
+-*textLiteral:		XScreenSaver
+-*textFile:		/usr/X11R6/lib/X11/doc/README
+-*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
diff --git a/x11-misc/xscreensaver/xscreensaver-4.21.ebuild b/x11-misc/xscreensaver/xscreensaver-4.21.ebuild
new file mode 100644
index 000000000000..521545560198
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.21.ebuild
@@ -0,0 +1,161 @@
+# 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 $
+
+inherit eutils flag-o-matic pam
+
+IUSE="pam kerberos krb4 gtk gnome opengl jpeg xinerama offensive motif"
+
+DESCRIPTION="a modular screensaver for X11"
+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
+		gnome? ( >=gnome-extra/yelp-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-extra/yelp-2 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 '  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.'
+		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
+	epatch ${FILESDIR}/${PN}-4.21-norpm.patch
+	# tweaks the default configuration (driver/XScreenSaver.ad.in)
+	epatch ${FILESDIR}/${PN}-4.21-settings.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/xscreensaver \
+		--with-configdir=/usr/share/xscreensaver/config \
+		--x-libraries=/usr/X11R6/lib \
+		--x-includes=/usr/X11R6/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
+
+	emake || die
+}
+
+src_install() {
+	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
+
+	make install_prefix="${D}" install || die
+
+	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/lib/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
+
+	pamd_mimic_system xscreensaver auth
+}