Fixed esound dep. Closes bug #981; thanks to Jason Brown!

5 files changed, 9 insertions, 71 deletions

diff --git a/app-misc/xlockmore/ChangeLog b/app-misc/xlockmore/ChangeLog
index f903084b033f..045969520524 100644
--- a/app-misc/xlockmore/ChangeLog
+++ b/app-misc/xlockmore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/xlockmore
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/ChangeLog,v 1.3 2002/03/02 18:09:02 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/ChangeLog,v 1.4 2002/03/06 23:38:24 g2boojum Exp $
+
+*xlockmore-5.03-r2 (6 March 2002)
+
+  6 March 2002; Grant Goodyear <g2boojum@shivan.org> xlockmore-5.03-r2.ebuild :
+
+  Fix esound dependency to be media-sound/esound.  Thanks to Jason Brown!
 
 *xlockmore-5.03-r1 (2 March 2002)
 
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.03-r1 b/app-misc/xlockmore/files/digest-xlockmore-5.03-r1
deleted file mode 100644
index 0c8cf283098a..000000000000
--- a/app-misc/xlockmore/files/digest-xlockmore-5.03-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f3a30c92e4d241dd81c6059f2724c55 xlockmore-5.03.tar.gz 1730062
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.03 b/app-misc/xlockmore/files/digest-xlockmore-5.03-r2
index 0c8cf283098a..0c8cf283098a 100644
--- a/app-misc/xlockmore/files/digest-xlockmore-5.03
+++ b/app-misc/xlockmore/files/digest-xlockmore-5.03-r2
diff --git a/app-misc/xlockmore/xlockmore-5.03-r1.ebuild b/app-misc/xlockmore/xlockmore-5.03-r2.ebuild
index d2050a88b46b..94c9b71008b9 100644
--- a/app-misc/xlockmore/xlockmore-5.03-r1.ebuild
+++ b/app-misc/xlockmore/xlockmore-5.03-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.03-r1.ebuild,v 1.1 2002/03/02 18:09:02 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.03-r2.ebuild,v 1.1 2002/03/06 23:38:24 g2boojum Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Just another screensaver application for X"
@@ -11,7 +11,7 @@ DEPEND="virtual/x11 media-libs/freetype
 	opengl? ( virtual/opengl )
 	pam? ( sys-libs/pam )
 	nas? ( media-libs/nas )
-	esd? ( media-libs/esound )"
+	esd? ( media-sound/esound )"
 	# motif? ( >=x11-libs/openmotif-2.1.30-r1 )
 	# gtk? ( x11-libs/gtk+ )
 
diff --git a/app-misc/xlockmore/xlockmore-5.03.ebuild b/app-misc/xlockmore/xlockmore-5.03.ebuild
deleted file mode 100644
index 25e0c1385a9a..000000000000
--- a/app-misc/xlockmore/xlockmore-5.03.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.03.ebuild,v 1.1 2002/03/01 10:21:24 blocke Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Just another screensaver application for X"
-SRC_URI="ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${P}.tar.gz"
-HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
-
-DEPEND="virtual/x11 media-libs/freetype
-	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
-	nas? ( media-libs/nas )
-	esd? ( media-libs/esound )
-	motif? ( >=x11-libs/openmotif-2.1.30-r1 )
-	gtk? ( x11-libs/gtk+ )"
-
-src_compile() {
-
-	local myconf
-
-	use pam && myconf="--enable-pam"
-	use nas || myconf="${myconf} --without-nas"
-	use esd && myconf="${myconf} --with-esound"
-	use opengl || myconf="${myconf} --without-opengl"
-	use motif || myconf="${myconf} --without-motif"
-	use gtk || myconf="${myconf} --without-gtk"
-
-	./configure --prefix=/usr --mandir=${prefix}/man/man1 \
-		--sharedstatedir=/usr/share/xlockmore --host=${CHOST} ${myconf} || die
-
-	emake || die
-
-	# configure script seems to suffer braindamage and doesn't setup
-	# correct makefiles for these, so they are disabled for now until
-	# some kind soul wants to submit a patch ;)
-
-	#if [ "`use gtk`" ] ; then
-	#	cd ${S}/xglock
-	#	make all || die
-	#fi
-
-	#if [ "`use motif`" ] ; then
-	#	cd ${S}/xmlock
-	#	make all || die
-	#fi
-
-    
-}
-
-src_install () {
-
-	make prefix=${D}/usr mandir=${D}/usr/man/man1 xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults install || die
-
-	exeinto /usr/bin
-
-	# known issue: how do you tell xlock where its sounds are?
-	insinto /usr/share/xlockmore
-	doins sounds/*
-
-#	use motif && doexe ${S}/xmlock/xmlock 
-#	use gtk && doexe ${S}/xglock/xglock
-
-	dodoc docs/* README 
-#	use gtk && dodoc xglock/xglockrc xglock/README.xglock
-
-}