bugfix revision

7 files changed, 10 insertions, 172 deletions

diff --git a/app-misc/xscreensaver/ChangeLog b/app-misc/xscreensaver/ChangeLog
index 735de349f747..dacee92decb6 100644
--- a/app-misc/xscreensaver/ChangeLog
+++ b/app-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2002/06/01 11:16:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/ChangeLog,v 1.9 2002/06/02 09:05:26 azarah Exp $
+
+*xscreensaver-4.02-r3 (02 June 2002)
+
+  2 June 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Should resolve bugs #1800, #3206, #3299. Thanks to A. Lucien Meyers for
+  bringing it to my attention, and Ryan Shaw for the fix and related bugs.
 
 *xscreensaver-4.02-r2 (01 June 2002)
 
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r1 b/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r1
deleted file mode 100644
index a352279d3ce7..000000000000
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea0deb9c38cae11b89ea3dd5c0a04540 xscreensaver-4.02.tar.gz 2201442
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r2 b/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r2
deleted file mode 100644
index a352279d3ce7..000000000000
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea0deb9c38cae11b89ea3dd5c0a04540 xscreensaver-4.02.tar.gz 2201442
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.02 b/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r3
index a352279d3ce7..a352279d3ce7 100644
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.02
+++ b/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r3
diff --git a/app-misc/xscreensaver/xscreensaver-4.02-r1.ebuild b/app-misc/xscreensaver/xscreensaver-4.02-r1.ebuild
deleted file mode 100644
index 7a2a79e2e782..000000000000
--- a/app-misc/xscreensaver/xscreensaver-4.02-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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-r1.ebuild,v 1.1 2002/05/29 23:13:15 spider 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/"
-
-DEPEND="virtual/x11 sys-devel/bc
-	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"
-
-RDEPEND="virtual/x11
-	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"
-
-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"
-	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
-}
-
-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}
-	
-}
-
diff --git a/app-misc/xscreensaver/xscreensaver-4.02-r2.ebuild b/app-misc/xscreensaver/xscreensaver-4.02-r3.ebuild
index c1ecbd7a886a..14f99fde2e8a 100644
--- a/app-misc/xscreensaver/xscreensaver-4.02-r2.ebuild
+++ b/app-misc/xscreensaver/xscreensaver-4.02-r3.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.02-r2.ebuild,v 1.1 2002/06/01 11:16:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.02-r3.ebuild,v 1.1 2002/06/02 09:05:26 azarah Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="a modular screensaver for X11"
@@ -72,6 +72,6 @@ src_install() {
 		doins "${FILESDIR}/pam.d/xscreensaver"
 	fi
 	
-	[ -n "`use kde`" ] || rm -rf ${D}/${KDEDIR}
+	[ -n "`use kde`" ] || ( [ -n "${KDEDIR}" ] && rm -rf ${D}/${KDEDIR} )
 }
 
diff --git a/app-misc/xscreensaver/xscreensaver-4.02.ebuild b/app-misc/xscreensaver/xscreensaver-4.02.ebuild
deleted file mode 100644
index 492731c9b7b4..000000000000
--- a/app-misc/xscreensaver/xscreensaver-4.02.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.ebuild,v 1.3 2002/05/23 06:50:09 seemant 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/"
-
-DEPEND="virtual/x11 sys-devel/bc
-	gtk? ( =x11-libs/gtk+-1.2* )
-	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 )"
-
-RDEPEND="virtual/x11
-	gtk? ( =x11-libs/gtk+-1.2* )
-	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 )"
-
-src_compile() {
-	local myconf=""
-	if [ "`use gnome`" ]
-	then
-		myconf="${myconf} --with-gnome"
-	else
-		myconf="${myconf} --without-gnome"
-	fi
-	if [ "`use gtk`" ]
-	then
-		myconf="${myconf} --with-gtk"
-	else
-		myconf="${myconf} --without-gtk"
-	fi
-	if [ "`use motif`" ]
-	then
-		myconf="${myconf} --with-motif"
-	else
-		myconf="${myconf} --without-motif"
-	fi
-	if [ "`use pam`" ]
-	then
-		myconf="${myconf} --with-pam"
-	else
-		myconf="${myconf} --without-pam"
-	fi
-	if [ "`use opengl`" ]
-	then
-		myconf="${myconf} --with-gl --with-gle"
-	else
-		myconf="${myconf} --without-gl --without-gle"
-	fi
-
-	./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
-}
-
-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}
-	
-}
-