Version bump with modular X DEPEND.

Package-Manager: portage-2.1_pre3-r1

7 files changed, 95 insertions, 96 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index b7e229df1bcc..59005ea1d407 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xlockmore
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.36 2006/01/21 14:18:58 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.37 2006/01/21 15:55:41 nelchael Exp $
+
+*xlockmore-5.21 (21 Jan 2006)
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -files/XLock.ad.patch,
+  -xlockmore-5.12.ebuild, +xlockmore-5.21.ebuild:
+  Version bump with modular X DEPEND.
 
   21 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> xlockmore-5.19.ebuild:
   Stable on ppc.
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 9738778ad416..18c259645ba3 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,9 +1,8 @@
-MD5 476046fb074e21864789826d046f2bcb ChangeLog 7623
-MD5 65f2645fbf61038ec856ee0a3897c587 files/XLock.ad.patch 773
-MD5 be40cedb5d46e442958e0a182a87380c files/digest-xlockmore-5.12 68
+MD5 2e2f208b92af379027a045f6721ce978 ChangeLog 7821
 MD5 9f4d2fc6b5d4094cf494e606b957e8a4 files/digest-xlockmore-5.17-r1 68
 MD5 1a8e977b105234e070f4eebb6233f675 files/digest-xlockmore-5.19 68
+MD5 e949eccd26e4bfa4a2f975c37131d132 files/digest-xlockmore-5.21 68
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
-MD5 38486e843cd2ea804407188f259256b0 xlockmore-5.12.ebuild 1948
 MD5 3e1e5207af65062e45daac01d2b8a2dc xlockmore-5.17-r1.ebuild 1692
 MD5 3510eeae4f151d1faff245a4e7987cc0 xlockmore-5.19.ebuild 1693
+MD5 3306709129e25a30327091602035f54b xlockmore-5.21.ebuild 1954
diff --git a/x11-misc/xlockmore/files/XLock.ad.patch b/x11-misc/xlockmore/files/XLock.ad.patch
deleted file mode 100644
index b16bfa2b5471..000000000000
--- a/x11-misc/xlockmore/files/XLock.ad.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xlock/XLock.ad	2004-04-12 10:33:03.000000000 -0400
-+++ xlock/XLock.ad.new	2004-05-26 13:33:39.553577432 -0400
-@@ -43,10 +43,10 @@
- !XLock.icongeometry: 256x256
- 
- ! For sound
--XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au
--XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au
--XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au
--XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au
-+XLock.locksound: /usr/share/xlockmore/sounds/thank-you.au
-+XLock.infosound: /usr/share/xlockmore/sounds/identify-please.au
-+XLock.validsound: /usr/share/xlockmore/sounds/complete.au
-+XLock.invalidsound: /usr/share/xlockmore/sounds/not-programmed.au
- !XLock.locksound: complete.au
- !XLock.infosound: identify-please.au
- !XLock.validsound: thank-you.au
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.12 b/x11-misc/xlockmore/files/digest-xlockmore-5.12
deleted file mode 100644
index 241ecea14138..000000000000
--- a/x11-misc/xlockmore/files/digest-xlockmore-5.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f58758fa3757984edee42e141c7a80dc xlockmore-5.12.tar.bz2 1568824
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.21 b/x11-misc/xlockmore/files/digest-xlockmore-5.21
new file mode 100644
index 000000000000..4ff6278d629a
--- /dev/null
+++ b/x11-misc/xlockmore/files/digest-xlockmore-5.21
@@ -0,0 +1 @@
+MD5 eefe878d7efaa982ee53553c78534315 xlockmore-5.21.tar.bz2 1794442
diff --git a/x11-misc/xlockmore/xlockmore-5.12.ebuild b/x11-misc/xlockmore/xlockmore-5.12.ebuild
deleted file mode 100644
index 89f18e09ccc3..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.12.ebuild,v 1.14 2005/07/18 23:36:38 smithj Exp $
-
-inherit gnuconfig eutils
-
-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="amd64 ppc ppc64 sparc x86"
-
-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"
-
-	epatch ${FILESDIR}/XLock.ad.patch || die "epatch failed"
-
-	./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.21.ebuild b/x11-misc/xlockmore/xlockmore-5.21.ebuild
new file mode 100644
index 000000000000..6f2c89667c9a
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.21.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.21.ebuild,v 1.1 2006/01/21 15:55:41 nelchael Exp $
+
+inherit gnuconfig eutils pam flag-o-matic
+
+IUSE="nas esd motif opengl truetype gtk pam xlockrc"
+
+DESCRIPTION="Just another screensaver application for X"
+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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( (
+		media-libs/mesa
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXdmcp
+		x11-libs/libXt
+		x11-libs/libXpm )
+	virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/xineramaproto )
+	virtual/x11 )
+	media-libs/freetype
+	opengl? ( virtual/opengl )
+	pam? ( virtual/pam )
+	nas? ( media-libs/nas )
+	esd? ( media-sound/esound )
+	motif? ( x11-libs/openmotif )
+	gtk? ( =x11-libs/gtk+-1.2* )"
+
+src_compile() {
+
+	local myconf
+
+	use xlockrc && myconf="${myconf} --enable-xlockrc"
+	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
+
+	econf \
+		--sharedstatedir=${D}/usr/share/xlockmore \
+		--enable-vtlock \
+		--without-ftgl \
+		$(use_enable pam) \
+		$(use_with truetype ttf) \
+		$(use_with gtk) \
+		$(use_with motif) \
+		$(use_with esd esound) \
+		$(use_with nas) \
+		${myconf} \
+		|| die "econf failed"
+
+	# fixes suid-with-lazy-bindings problem
+	append-flags $(bindnow-flags)
+
+	emake || die "Make failed"
+
+}
+
+src_install() {
+	einstall \
+		xapploaddir=${D}/etc/X11/app-defaults \
+		mandir=${D}/usr/share/man/man1 \
+		|| die "einstall failed"
+
+	#Install pam.d file and unset setuid root
+	pamd_mimic_system xlock auth
+	use pam && chmod 755 ${D}/usr/bin/xlock
+
+	insinto /usr/share/xlockmore/sounds
+	doins sounds/*
+
+	dodoc docs/* README
+	dohtml docs/*.html
+	rm ${D}/usr/share/doc/${PF}/*.html.gz
+}