#93159, cleanup, version bump

(Portage version: 2.0.51.22-r1)

7 files changed, 42 insertions, 102 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index 5702b7563e58..44ea5957a311 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xlockmore
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.19 2005/04/29 09:51:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.20 2005/06/13 23:35:35 smithj Exp $
+
+*xlockmore-5.18 (13 Jun 2005)
+
+  13 Jun 2005; Jonathan Smith <smithj@gentoo.org> -xlockmore-5.04.ebuild,
+  -xlockmore-5.08.2.ebuild, +xlockmore-5.18.ebuild:
+  #93159, version bump, cleanup
 
   29 Apr 2005; Markus Rothe <corsair@gentoo.org> xlockmore-5.12.ebuild:
   Stable on ppc64
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index d5f2d53d007f..ac03b6077437 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,11 +1,9 @@
 MD5 f0e91ae559a591327313e6ca10deed83 ChangeLog 5382
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
-MD5 1beae149d4ad5cccebea7904c02ad479 xlockmore-5.04.ebuild 1820
-MD5 250748679bc8da624f2dafff102d7019 xlockmore-5.08.2.ebuild 1875
 MD5 03fbd622aa71ec61772fee5f902cabd1 xlockmore-5.11.1.ebuild 1879
 MD5 86689f8d562ebfd5bca7dee1fa917d1e xlockmore-5.12.ebuild 1949
+MD5 9f3a9126a2582d8a2704e3262bb0e2af xlockmore-5.18.ebuild 1698
 MD5 65f2645fbf61038ec856ee0a3897c587 files/XLock.ad.patch 773
-MD5 589c4732f3e791a2cad0f52c7ec09908 files/digest-xlockmore-5.04 68
-MD5 7c6285fb6c9ff44a2590f166ecd553ef files/digest-xlockmore-5.08.2 70
 MD5 ed71265bdbcff414270728e5eef3196d files/digest-xlockmore-5.11.1 70
 MD5 be40cedb5d46e442958e0a182a87380c files/digest-xlockmore-5.12 68
+MD5 69d208099f30b11e0bffa0fcfd210cac files/digest-xlockmore-5.18 68
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.04 b/x11-misc/xlockmore/files/digest-xlockmore-5.04
deleted file mode 100644
index d4a161664435..000000000000
--- a/x11-misc/xlockmore/files/digest-xlockmore-5.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99d3f2f4fd8e7c8d36411593d8a93629 xlockmore-5.04.tar.bz2 1471911
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.08.2 b/x11-misc/xlockmore/files/digest-xlockmore-5.08.2
deleted file mode 100644
index 6472be082d1e..000000000000
--- a/x11-misc/xlockmore/files/digest-xlockmore-5.08.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c122f9a99133dff896c989f148d97567 xlockmore-5.08.2.tar.bz2 1555399
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.18 b/x11-misc/xlockmore/files/digest-xlockmore-5.18
new file mode 100644
index 000000000000..774638b3c077
--- /dev/null
+++ b/x11-misc/xlockmore/files/digest-xlockmore-5.18
@@ -0,0 +1 @@
+MD5 211673f6be51bdec96718b891bf9ebb9 xlockmore-5.18.tar.bz2 1738513
diff --git a/x11-misc/xlockmore/xlockmore-5.08.2.ebuild b/x11-misc/xlockmore/xlockmore-5.08.2.ebuild
deleted file mode 100644
index 7b2a8e469a23..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.08.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.08.2.ebuild,v 1.8 2004/06/24 22:41:55 agriffis Exp $
-
-inherit gnuconfig
-
-IUSE="nas esd motif opengl truetype gtk pam"
-
-DESCRIPTION="Just another screensaver application for X"
-SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/xlockmore/${P}.tar.bz2"
-HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 sparc amd64"
-
-DEPEND="virtual/x11
-	media-libs/freetype
-	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )
-	motif? ( x11-libs/openmotif )
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
-src_compile() {
-	gnuconfig_update
-
-	local myconf
-	myconf="--enable-vtlock"
-	use pam && myconf="${myconf} --enable-pam" \
-		|| myconf="${myconf} --disable-pam --enable-xlockrc"
-	use nas || myconf="${myconf} --without-nas"
-	use esd && myconf="${myconf} --with-esound"
-	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
-	use truetype || myconf="${myconf} --without-ttf"
-
-	use motif || myconf="${myconf} --without-motif"
-	use gtk || myconf="${myconf} --without-gtk"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=${prefix}/share/man/man1 \
-		--sharedstatedir=/usr/share/xlockmore \
-		--host=${CHOST} ${myconf} || die "Configure failed"
-
-	emake || die "Make failed"
-
-}
-
-src_install() {
-	make install \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man/man1 \
-		xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults \
-		|| die "Install failed"
-
-	#Install pam.d file and unset setuid root
-	if use pam; then
-		insinto /etc/pam.d
-		newins etc/xlock.pamd xlock
-		chmod 111 ${D}/usr/bin/xlock
-	fi
-
-	insinto /usr/share/xlockmore/sounds
-	doins sounds/*
-
-	dodoc docs/* README
-	dohtml docs/*.html
-	rm ${D}/usr/share/doc/${PF}/*.html.gz
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.04.ebuild b/x11-misc/xlockmore/xlockmore-5.18.ebuild
index 055520a82721..74671fd80d4e 100644
--- a/x11-misc/xlockmore/xlockmore-5.04.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.18.ebuild
@@ -1,44 +1,55 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.04.ebuild,v 1.6 2004/07/15 00:57:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.18.ebuild,v 1.1 2005/06/13 23:35:35 smithj Exp $
+
+inherit gnuconfig eutils pam
 
 IUSE="nas esd motif opengl truetype gtk pam"
 
 DESCRIPTION="Just another screensaver application for X"
-SRC_URI="http://cvs.gentoo.org/~mholzer/${P}.tar.bz2
-		mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 sparc"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~ppc64"
 
 DEPEND="virtual/x11
 	media-libs/freetype
 	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	nas? ( media-libs/nas )
 	esd? ( media-sound/esound )
 	motif? ( x11-libs/openmotif )
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/XLock.ad.patch
+
+	gnuconfig_update
+}
+
 src_compile() {
+
 	local myconf
-	use pam && myconf="${myconf} --enable-pam" \
-		|| myconf="${myconf} --disable-pam --enable-xlockrc"
-	use nas || myconf="${myconf} --without-nas"
-	use esd && myconf="${myconf} --with-esound"
-	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
-	use truetype || myconf="${myconf} --without-ttf"
+	use pam || myconf="${myconf} --enable-xlockrc"
 
-	use motif || myconf="${myconf} --without-motif"
-	use gtk || myconf="${myconf} --without-gtk"
+	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
 
-	./configure \
-		--prefix=/usr \
-		--mandir=${prefix}/share/man/man1 \
+	econf \
 		--sharedstatedir=/usr/share/xlockmore \
-		--host=${CHOST} ${myconf} || die "Configure failed"
+		--enable-vtlock \
+		$(use_enable pam) \
+		$(use_with truetype ttf) \
+		$(use_with gtk) \
+		$(use_with motif) \
+		$(use_with esd esound) \
+		$(use_with nas) \
+		${myconf} \
+		|| die "econf failed"
 
 	emake || die "Make failed"
 
@@ -48,15 +59,12 @@ src_install() {
 	make install \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man/man1 \
-		xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults \
+		xapploaddir=${D}/etc/X11/app-defaults \
 		|| die "Install failed"
 
 	#Install pam.d file and unset setuid root
-	if use pam; then
-		insinto /etc/pam.d
-		newins etc/xlock.pamd xlock
-		chmod 111 ${D}/usr/bin/xlock
-	fi
+	pamd_mimic_system xlock auth
+	use pam && chmod 755 ${D}/usr/bin/xlock
 
 	insinto /usr/share/xlockmore/sounds
 	doins sounds/*