xlockmore 5.03: update and major ebuild revamping

5 files changed, 80 insertions, 58 deletions

diff --git a/app-misc/xlockmore/ChangeLog b/app-misc/xlockmore/ChangeLog
index b5501a8b6a24..712783882eec 100644
--- a/app-misc/xlockmore/ChangeLog
+++ b/app-misc/xlockmore/ChangeLog
@@ -1,13 +1,16 @@
 # 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.1 2002/02/01 21:53:09 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/ChangeLog,v 1.2 2002/03/01 10:21:24 blocke Exp $
 
-*xlockmore-5.02 (1 Feb 2002)
+*xlockmore-5.03 (1 March 2002)
+
+  1 March 2002; Bruce A. Locke <blocke@shivan.org> xlockmore-5.03.ebuild :
+
+  An update to 5.03 and a major reworking on the ebuild to support
+  more USE keywords...
+
+  Known Issues: gtk and motif dialog boxes disabled due to configure
+  script braindamage and I can't figure out how to tell xlock where its
+  sounds are stored...  Low priority issues in a package I've spent too
+  much time on already :(  If you figure it out, please file a bug report.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.01.2-r1 b/app-misc/xlockmore/files/digest-xlockmore-5.01.2-r1
deleted file mode 100644
index 293ecc1a8301..000000000000
--- a/app-misc/xlockmore/files/digest-xlockmore-5.01.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 773a682068874117aaa31d842aa9de56 xlockmore-5.01.2.tar.gz 1696131
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.03 b/app-misc/xlockmore/files/digest-xlockmore-5.03
new file mode 100644
index 000000000000..0c8cf283098a
--- /dev/null
+++ b/app-misc/xlockmore/files/digest-xlockmore-5.03
@@ -0,0 +1 @@
+MD5 3f3a30c92e4d241dd81c6059f2724c55 xlockmore-5.03.tar.gz 1730062
diff --git a/app-misc/xlockmore/xlockmore-5.01.2-r1.ebuild b/app-misc/xlockmore/xlockmore-5.01.2-r1.ebuild
deleted file mode 100644
index 92772e75b609..000000000000
--- a/app-misc/xlockmore/xlockmore-5.01.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.01.2-r1.ebuild,v 1.1 2001/10/06 15:30:15 danarmak Exp $
-
-#P=
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Just another screensaver application for X"
-SRC_URI="ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${A}"
-HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
-
-DEPEND="opengl? ( virtual/opengl )"
-
-src_compile() {
-
-    local myconf
-    if [ "`use pam`" ] ; then
-    myconf="--enable-pam"
-    fi
-    if [ -z "`use nas`" ] ; then 
-    myconf="--disable-nas"
-    fi
-    if [ "`use esd`" ] ; then
-    myconf="--enable-esd"
-    fi
-    if [ -z "`use opengl`" ] ; then
-    myconf="--disable-mesa"
-    fi
-
-    ./configure --prefix=/usr --mandir=${prefix}/man/man1 \
-	--host=${CHOST} ${myconf} || die
-    make || die
-    cd xglock/
-    make
-
-}
-
-src_install () {
-
-    make prefix=${D}/usr mandir=${D}/usr/man/man1 install || die
-    exeinto /usr/bin
-    doexe xmlock/xmlock
-    doexe xglock/xglock
-    dodoc docs/* README xglock/xglockrc xglock/README.xglock
-
-}
-
diff --git a/app-misc/xlockmore/xlockmore-5.03.ebuild b/app-misc/xlockmore/xlockmore-5.03.ebuild
new file mode 100644
index 000000000000..25e0c1385a9a
--- /dev/null
+++ b/app-misc/xlockmore/xlockmore-5.03.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+}