Remove old version. Port 5.19 to modular X.

(Portage version: 2.1_pre4-r1)

4 files changed, 23 insertions, 74 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index 7556b4647638..8e756c7e7d1c 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,10 @@
 # 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.38 2006/01/21 16:18:47 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.39 2006/02/11 00:14:50 nelchael Exp $
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -xlockmore-5.17-r1.ebuild:
+  Remove old version. Port 5.19 to modular X.
 
 *xlockmore-5.21-r1 (21 Jan 2006)
 
@@ -17,7 +21,7 @@
   21 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> xlockmore-5.19.ebuild:
   Stable on ppc.
 
-  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> xlockmore-5.19.ebuild:
+  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> xlockmore-5.19.ebuild:
   Use bindnow-flags function instead of -Wl,-z,now.
 
   13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.17-r1 b/x11-misc/xlockmore/files/digest-xlockmore-5.17-r1
deleted file mode 100644
index b2a1e08c2e90..000000000000
--- a/x11-misc/xlockmore/files/digest-xlockmore-5.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ebf62f611aab074c41aeae95231ce7f xlockmore-5.17.tar.bz2 1734958
diff --git a/x11-misc/xlockmore/xlockmore-5.17-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.17-r1.ebuild
deleted file mode 100644
index 5ebfdad35d3c..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.17-r1.ebuild
+++ /dev/null
@@ -1,69 +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.17-r1.ebuild,v 1.8 2005/08/13 23:27:07 hansmi 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"
-
-DEPEND="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 '-Wl,-z,now'
-
-	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
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.19.ebuild b/x11-misc/xlockmore/xlockmore-5.19.ebuild
index 230dc5c1a049..6b73f8f14da6 100644
--- a/x11-misc/xlockmore/xlockmore-5.19.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.19.ebuild
@@ -1,6 +1,6 @@
 # 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.19.ebuild,v 1.3 2006/01/21 14:18:58 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.19.ebuild,v 1.4 2006/02/11 00:14:50 nelchael Exp $
 
 inherit gnuconfig eutils pam flag-o-matic
 
@@ -14,7 +14,22 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-DEPEND="virtual/x11
+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 )