cleanup

3 files changed, 85 insertions, 2 deletions

diff --git a/app-misc/xscreensaver/ChangeLog b/app-misc/xscreensaver/ChangeLog
index 05bb1f8af30d..735de349f747 100644
--- a/app-misc/xscreensaver/ChangeLog
+++ b/app-misc/xscreensaver/ChangeLog
@@ -1,9 +1,14 @@
 # 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.7 2002/05/29 23:13:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/ChangeLog,v 1.8 2002/06/01 11:16:52 azarah Exp $
 
-  07 Apr 2002; Dan Armak <danarmak@gentoo.org> removed obsolete kde-env dep, fixes bug #1581.
+*xscreensaver-4.02-r2 (01 June 2002)
+
+  01 June 2002; Martin Schlemmer <azarah@gentoo.org> :
 
+  Just some general cleanups and USE flag additions.
+
+  07 Apr 2002; Dan Armak <danarmak@gentoo.org> removed obsolete kde-env dep, fixes bug #1581.
 
 *xscreensaver-4.02-r1 (29 May 2002)
   29 May 2002;  Spider <spider@gentoo.org> xscreensaver-4.02-r1.ebuild :
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r2 b/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r2
new file mode 100644
index 000000000000..a352279d3ce7
--- /dev/null
+++ b/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r2
@@ -0,0 +1 @@
+MD5 ea0deb9c38cae11b89ea3dd5c0a04540 xscreensaver-4.02.tar.gz 2201442
diff --git a/app-misc/xscreensaver/xscreensaver-4.02-r2.ebuild b/app-misc/xscreensaver/xscreensaver-4.02-r2.ebuild
new file mode 100644
index 000000000000..c1ecbd7a886a
--- /dev/null
+++ b/app-misc/xscreensaver/xscreensaver-4.02-r2.ebuild
@@ -0,0 +1,77 @@
+# 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.02-r2.ebuild,v 1.1 2002/06/01 11:16:52 azarah Exp $
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="a modular screensaver for X11"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+
+RDEPEND="virtual/x11
+	jpeg? ( media-libs/jpeg )
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
+	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 )
+	pam? ( >=sys-libs/pam-0.75 )
+	dev-libs/libxml2"
+
+DEPEND="${RDEPEND}
+	sys-devel/bc"
+
+src_compile() {
+
+	local myconf=""
+	use jpeg && myconf="${myconf} --with-jpeg"
+	use jpeg || myconf="${myconf} --without-jpeg"
+	use gnome && myconf="${myconf} --with-gnome --with-pixbuf"
+	use gnome || myconf="${myconf} --without-gnome"
+	use gtk && 	myconf="${myconf} --with-gtk"
+	use gtk || myconf="${myconf} --without-gtk"
+	use motif && myconf="${myconf} --with-motif"
+	use motif || myconf="${myconf} --without-motif"
+	use pam && myconf="${myconf} --with-pam"
+	use pam || myconf="${myconf} --without-pam"
+	use opengl && myconf="${myconf} --with-gl --with-gle"
+	use opengl || myconf="${myconf} --without-gl --without-gle"
+	
+	export C_INCLUDE_PATH="/usr/include/libxml2/libxml/"
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--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
+	unset C_INCLUDE_PATH
+}
+
+src_install() {
+
+	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
+
+	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
+		insinto /etc/pam.d
+		doins "${FILESDIR}/pam.d/xscreensaver"
+	fi
+	
+	[ -n "`use kde`" ] || rm -rf ${D}/${KDEDIR}
+}
+