Version bump. As of 4.19 GTK1 support has been removed. This closes bug #60379. Thank you to my NetNet buddy Ryan Finnie.

(Portage version: 2.0.51.16)

6 files changed, 236 insertions, 3 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 31a8b9cc995c..4deab3942c77 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.73 2005/02/24 20:45:34 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.74 2005/02/24 21:22:29 rizzo Exp $
+
+*xscreensaver-4.20 (24 Feb 2005)
+
+  24 Feb 2005; Don Seiler <rizzo@gentoo.org> metadata.xml,
+  +files/xscreensaver-4.20-norpm.patch, +xscreensaver-4.20.ebuild:
+  Version bump. As of 4.19 GTK1 support has been removed. This closes bug
+  #60379. Thank you to my NetNet buddy Ryan Finnie.
 
   24 Feb 2005; Don Seiler <rizzo@gentoo.org> xscreensaver-4.16.ebuild:
   Fixing dependency so it matches the terms of configure flags. Bug was
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 0b1789bd2f87..814670bb5326 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,6 +3,7 @@ MD5 0c7e1c065d3ff356793aa700b36c3380 metadata.xml 309
 MD5 f934f262880ab5604c675d1b031dd437 xscreensaver-4.14-r2.ebuild 4661
 MD5 0e62ff1b856345ffcc2de00ca43af8eb xscreensaver-4.15.ebuild 4507
 MD5 763f28f501a192b28b5322206bcae0ab xscreensaver-4.16.ebuild 4820
+MD5 5109b80b21f18a8574adcc3e28e195b2 xscreensaver-4.20.ebuild 4827
 MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
@@ -11,4 +12,5 @@ MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
 MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
 MD5 0722c17c948e57fa839a1c5acbdc5f22 files/digest-xscreensaver-4.16 70
 MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
+MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.20 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.20
new file mode 100644
index 000000000000..0004b9ec3c5e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.20
@@ -0,0 +1 @@
+MD5 7df61d5d8e3190711988534f7ca84eda xscreensaver-4.20.tar.gz 4437919
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch
new file mode 100644
index 000000000000..b4001dfc5b2e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch
@@ -0,0 +1,39 @@
+--- configure.orig	2005-02-23 01:59:54.000000000 -0800
++++ configure	2005-02-23 10:10:12.082129160 -0800
+@@ -21762,36 +21762,6 @@
+ 
+ # M4 sucks!!
+ 
+-rpmv=`(rpm -qv xscreensaver) 2>/dev/null | \
+-      sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'`
+-
+-
+-if test \! -z "$rpmv" ; then
+-  rpmbdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
+-  rpmhdir=`rpm -ql xscreensaver | 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 (with"
+-  warn2 '"rpm -ve xscreensaver") before running "make install"'
+-  warn2 "from 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
+-
+-
+ if test "${bindir}" = "${HACKDIR}" ; then
+   do_dir_warning=yes
+ fi
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index bb167d0c63f3..9440f7611326 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 	<herd>desktop-misc</herd>
 <maintainer>
-	<email>liquidx@gentoo.org</email>
-	<description>looking for volunteers to take over maintaining this</description>
+	<email>rizzo@gentoo.org</email>
+	<description>I'll work on this in liquidx's absence.  Can't guarantee I
+		won't break anything.</description>
 </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xscreensaver/xscreensaver-4.20.ebuild b/x11-misc/xscreensaver/xscreensaver-4.20.ebuild
new file mode 100644
index 000000000000..24a1984b8988
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.20.ebuild
@@ -0,0 +1,183 @@
+# 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.20.ebuild,v 1.1 2005/02/24 21:22:29 rizzo Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="pam kerberos krb4 gtk2 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="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~hppa ~ppc64"
+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
+	gtk2? (
+		>=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? ( sys-libs/pam )
+	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl
+	          >=media-libs/gle-3.0.1 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bc
+	dev-lang/perl
+	gtk2? ( 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 gtk2 ; 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 "gtk2" USE flag.'
+		else
+			ewarn "You have enabled neither gtk2 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.20-norpm.patch
+	# set default fortune to /usr/bin/fortune even if one can't be found
+	epatch ${FILESDIR}/${PN}-4.14-fortune.patch
+	# disabled because it is out of date - liquidx (15/06/2004)
+	# use icc && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-icc.patch
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	myconf="--with-fortune=/usr/bin/fortune"
+
+	if use gtk2 ; 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 xinerama \
+		&& myconf="${myconf} --with-xinerama-ext" \
+		|| myconf="${myconf} --without-xinerama-ext"
+
+	use pam \
+		&& myconf="${myconf} --with-pam" \
+		|| myconf="${myconf} --without-pam"
+
+	use kerberos && use krb4 \
+		&& myconf="${myconf} --with-kerberos" \
+		|| myconf="${myconf} --without-kerberos"
+
+	use opengl \
+		&& myconf="${myconf} --with-gl --with-gle" \
+		|| myconf="${myconf} --without-gl --without-gle"
+
+	use jpeg \
+		&& myconf="${myconf} --with-jpeg" \
+		|| myconf="${myconf} --without-jpeg"
+
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+
+	if use icc ; then
+		export CC=icc
+		autoconf
+	fi
+
+	econf \
+		--enable-hackdir=/usr/lib/xscreensaver \
+		--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 \
+		${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/control-center/screensavers /usr/lib/xscreensaver/config
+
+	# Remove "extra" capplet
+	rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
+
+	if use gnome ; then
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	fi
+
+	if use pam ; then
+		insinto /etc/pam.d
+		doins ${FILESDIR}/pam.d/xscreensaver
+	fi
+}