update deps, xinerama and other bug fixes

5 files changed, 195 insertions, 3 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 9929bfedd4db..a1ee3ac2ac81 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.22 2003/04/28 11:16:57 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.23 2003/05/26 10:39:12 liquidx Exp $
+
+*xscreensaver-4.09-r1 (26 May 2003)
+
+  26 May 2003; Alastair Tse <liquidx@gentoo.org> xscreensaver-4.09-r1.ebuild,
+  files/xscreensaver-4.09-norpm.patch:
+  fixed deps, disabled rpm and general ebuild cleanups
 
 *xscreensaver-4.09 (17 Mar 2003)
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 88b429f5bc7d..0b48bf7efcb3 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,8 +1,9 @@
-MD5 7e51f913f5397084fd15e0cee02131b5 ChangeLog 5844
+MD5 4a26d1d689cd6aedd6c1af22895316fe ChangeLog 6054
 MD5 77a551f7372385023eb2acfa9101647d xscreensaver-4.05-r3.ebuild 2472
-MD5 9cbc9ea3b09bf2bf4890fea2d3b8a11b xscreensaver-4.09-r1.ebuild 3587
+MD5 20b24d3270f9c7e9f5b2e91b2c3281fd xscreensaver-4.09-r1.ebuild 3885
 MD5 83859c40483703b3be15b8d52a50886e xscreensaver-4.09.ebuild 3748
 MD5 ab5c2c76af72bf7bc833b2ad04a4875a files/digest-xscreensaver-4.05-r3 70
 MD5 996f7e90ef582df52f8ea2c127eb1e7b files/digest-xscreensaver-4.09 70
 MD5 996f7e90ef582df52f8ea2c127eb1e7b files/digest-xscreensaver-4.09-r1 70
+MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.09-norpm.patch 1266
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.09-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.09-r1
new file mode 100644
index 000000000000..af2558f677c3
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.09-r1
@@ -0,0 +1 @@
+MD5 fa43fdd68d75a1d2fa08afb8b0d9fa8e xscreensaver-4.09.tar.gz 3503133
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.09-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.09-norpm.patch
new file mode 100644
index 000000000000..4972cd1e2380
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.09-norpm.patch
@@ -0,0 +1,39 @@
+--- xscreensaver-4.09/configure	2003-03-17 22:29:59.000000000 +0000
++++ xscreensaver-4.09/configure	2003-05-23 09:36:55.000000000 +0100
+@@ -19592,36 +19592,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.  See the RPM documentation for more info."
+-  echo ""
+-
+-  if test "$rpmbdir" = "$rpmhdir" ; then
+-    warn2 "The RPM version was installed in $rpmbdir/."
+-  else
+-    warn2 "The RPM version was installed in $rpmbdir/,"
+-    warn2 "with demos in $rpmhdir/."
+-  fi
+-
+-  do_dir_warning=yes
+-fi
+-
+-
+ if test "${bindir}" = "${HACKDIR}" ; then
+   do_dir_warning=yes
+ fi
diff --git a/x11-misc/xscreensaver/xscreensaver-4.09-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-4.09-r1.ebuild
new file mode 100644
index 000000000000..357a7267c5de
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.09-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.09-r1.ebuild,v 1.1 2003/05/26 10:39:12 liquidx Exp $
+
+IUSE="pam kerberos gtk gtk2 gnome opengl jpeg xinerama"
+
+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"
+SLOT="0"
+
+# NOTE: the motif interface is not supported/developed anymore
+#       by xscreensaver devs. so we should deprecate it soon
+# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2
+#        automatically over gtk1. we need to patch the autoconf stuff
+#        to correctly allow users to choose gtk1/gtk2. right now it
+#        only selects the deps.
+
+RDEPEND="media-libs/netpbm
+	app-games/fortune-mod	
+	>=media-libs/xpm-3.4
+	>=sys-libs/zlib-1.1.4
+	gtk? ( >=dev-libs/libxml2-2.5 )
+	gtk? ( gtk2? ( >=x11-libs/gtk+-2
+					>=gnome-base/libglade-1.99
+					>=dev-libs/glib-2 ) )
+	gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) )
+	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
+					=gnome-base/libglade-0.17* ) )
+	gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
+							>=media-libs/gdk-pixbuf-0.18
+							>=gnome-base/gnome-libs-1.4 ) ) )
+	!gtk? ( virtual/motif
+		>=media-libs/gdk-pixbuf-0.18 )
+	pam? ( sys-libs/pam )
+	kerberos? ( >=app-crypt/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 )"
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
+	epatch ${FILESDIR}/${P}-norpm.patch
+	
+	# disabled this hack, don't know why it is needed.
+	#cp Makefile.in Makefile.in.orig
+	#sed "s:hacks/glx po:hacks/glx:" \
+	#	Makefile.in.orig > Makefile.in
+}
+
+src_compile() {
+	local myconf=""
+	
+	myconf="--with-fortune=/usr/bin/fortune"
+	
+	use gtk \
+		&& myconf="${myconf} --without-motif --with-gtk --with-xml" \
+		|| myconf="${myconf} --with-motif --without-gtk"
+		
+	use xinerama \
+		&& myconf="${myconf} --with-xinerama-ext" \
+		|| myconf="${myconf} --without-xinerama-ext"
+
+	use pam \
+		&& myconf="${myconf} --with-pam" \
+		|| myconf="${myconf} --without-pam"
+
+	use kerberos \
+		&& 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 [ -z "`use gtk2`" -a -n "`use gtk`" ]; then
+		if [ -n "`use gnome`" ]; then
+			myconf="${myconf} --with-gnome --with-pixbuf"
+		fi
+	fi		
+		
+	#export C_INCLUDE_PATH="/usr/include/libxml2/"
+	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
+	
+	# install correctly in gnome2 
+	use gnome && ( \
+		dodir /usr/share/gnome/capplets
+		insinto /usr/share/gnome/capplets
+		doins driver/screensaver-properties.desktop
+	)
+
+	# Remove "extra" capplet
+	rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
+
+	use gnome && ( \
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	)
+
+	use pam && ( \
+		insinto /etc/pam.d
+		doins ${FILESDIR}/pam.d/xscreensaver
+	)
+}