bugfixes

3 files changed, 126 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index ad63b44674da..19a26c14a5dc 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.7 2002/10/24 17:26:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.8 2002/10/26 00:11:50 azarah Exp $
+
+xscreensaver-4.06-r1 (26 Oct 2002)
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xscreensaver-4.06-r1.ebuild :
+
+  Change "xml" flag to "xml2".  Remove "gnome" USE flag.  Change "gtk" in USE
+  to depend on gtk+2, and also add libglade2.  If gtk+ is not in USE, make it
+  depend on gdk-pixbuf.  This should close bug #9619.
 
 xscreensaver-4.06 (24 Oct 2002)
 
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.06-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.06-r1
new file mode 100644
index 000000000000..965794b29b81
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.06-r1
@@ -0,0 +1 @@
+MD5 acf78cc3ce7c8145dea79e9aa610c86d xscreensaver-4.06.tar.gz 3209164
diff --git a/x11-misc/xscreensaver/xscreensaver-4.06-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-4.06-r1.ebuild
new file mode 100644
index 000000000000..013ec4bfad16
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.06-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.06-r1.ebuild,v 1.1 2002/10/26 00:11:50 azarah Exp $
+
+IUSE="pam kerberos gtk motif gnome opengl jpeg xml"
+
+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 ~sparc64"
+SLOT="0"
+
+DEPEND="sys-devel/bc
+	gtk? ( >=x11-libs/gtk+-2.0
+		>=gnome-base/libglade-2.0
+		dev-libs/libxml2 )
+	!gtk? ( media-libs/gdk-pixbuf )
+	pam? ( sys-libs/pam )
+	motif? ( >=x11-libs/openmotif-2.1.30 )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl
+		>=media-libs/gle-3.0.1 )
+	xml? ( dev-libs/libxml2 )"
+
+RDEPEND="${DEPEND}
+	media-libs/netpbm"
+
+src_unpack() {
+
+	unpack ${A}
+	
+	cd ${S}
+	cp Makefile.in Makefile.in.orig
+	sed "s:hacks/glx po:hacks/glx:" \
+		Makefile.in.orig > Makefile.in
+}
+
+src_compile() {
+
+	local myconf=""
+	
+	use gtk \
+		&& myconf="${myconf} --with-gtk --with-xml" \
+		|| myconf="${myconf} --without-gtk"
+
+	use motif \
+		&& myconf="${myconf} --with-motif" \
+		|| myconf="${myconf} --without-motif"
+
+	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 xml2 \
+		&& myconf="${myconf} --with-xml" \
+		|| myconf="${myconf} --without-xml"
+	
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	export C_INCLUDE_PATH="/usr/include/libxml2/"
+	econf \
+		--enable-hackdir=/usr/lib/xscreensaver \
+		--with-mit-ext \
+		--with-dpms-ext \
+		--with-xinerama-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
+	)
+
+	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
+	)
+}
+