fixed bug 3479

3 files changed, 51 insertions, 19 deletions

diff --git a/app-misc/xscreensaver/ChangeLog b/app-misc/xscreensaver/ChangeLog
index b4a70b8de62a..724d13daec25 100644
--- a/app-misc/xscreensaver/ChangeLog
+++ b/app-misc/xscreensaver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/xscreensaver
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/ChangeLog,v 1.11 2002/06/06 22:19:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/ChangeLog,v 1.12 2002/06/10 06:19:48 seemant Exp $
+
+
+*xscreensaver-4.04.2-r2 (9 Jun 2002)
+
+  9 Jun 2002; Seemant Kulleen <seemant@gentoo.orG>
+  xscreensaver-4.04.2-r2.ebuild files/digest-xscreensaver-4.04.2-r2 :
+
+  There was a typo in the last revision which caused GL screenhacks to fail.
+  This closes bug #3479 by phil@lsu.edu (Phil Bordelon)
 
 *xscreensaver-4.04.2-r1 (6 Jun 2002)
 
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2 b/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r2
index a4e51d2403b3..a4e51d2403b3 100644
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2
+++ b/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r2
diff --git a/app-misc/xscreensaver/xscreensaver-4.04.2.ebuild b/app-misc/xscreensaver/xscreensaver-4.04.2-r2.ebuild
index 84a5ba937fd0..af25b33bc37d 100644
--- a/app-misc/xscreensaver/xscreensaver-4.04.2.ebuild
+++ b/app-misc/xscreensaver/xscreensaver-4.04.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Martin Schlemmer <azarah@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.04.2.ebuild,v 1.1 2002/06/05 05:13:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.04.2-r2.ebuild,v 1.1 2002/06/10 06:19:48 seemant Exp $
 
 S="${WORKDIR}/${P/.2/}"
 DESCRIPTION="a modular screensaver for X11"
@@ -9,20 +9,51 @@ SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
 HOMEPAGE="http://www.jwz.org/xscreensaver/"
 
 DEPEND="virtual/x11 sys-devel/bc
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
+	gtk? ( x11-libs/gtk+ )
 	motif? ( >=x11-libs/openmotif-2.1.30 )
 	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
-	gnome? ( >=gnome-base/control-center-1.4.0.1-r1 )
+	gnome? ( media-libs/gdk-pixbuf
+		>=gnome-base/control-center-1.4.0.1-r1 )
 	pam? ( >=sys-libs/pam-0.75 )
 	dev-libs/libxml2"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	use nls && ( \
+		cd po
+		patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+	) || ( \
+		cp Makefile.in Makefile.in.orig
+		sed "s:hacks/glx po:hacks/glx:" \
+			Makefile.in.orig > Makefile.in
+	)
+}
+
 src_compile() {
 	local myconf=""
-	use gnome && myconf="${myconf} --with-gnome" || myconf="${myconf} --without-gnome"
-	use gtk && 	myconf="${myconf} --with-gtk" || 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 opengl myconf="${myconf} --with-gl --with-gle" || myconf="${myconf} --without-gl --without-gle"
+	use gnome \
+		&& myconf="${myconf} --with-gnome" \
+		|| myconf="${myconf} --without-gnome"
+
+	use gtk \
+		&& myconf="${myconf} --with-gtk" \
+		|| 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 opengl \
+		&& myconf="${myconf} --with-gl --with-gle" \
+		|| myconf="${myconf} --without-gl --without-gle"
+
 	export C_INCLUDE_PATH="/usr/include/libxml2/libxml/"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
@@ -49,16 +80,8 @@ src_install() {
 	
 	make install_prefix="${D}" install || die
 
-	# Fix double Control Center entry
-	rm -f "${D}/usr/share/control-center/capplets/screensaver.desktop"
-
-	if [ "`use pam`" ]
-	then
+	use pam && ( \
 		insinto /etc/pam.d
 		doins "${FILESDIR}/pam.d/xscreensaver"
-	fi
-	
-	[ -n "`use kde`" ] || rm -rf ${D}/${KDEDIR}
-	
+	)
 }
-