summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xtrlock/ChangeLog8
-rw-r--r--x11-misc/xtrlock/files/digest-xtrlock-2.01
-rw-r--r--x11-misc/xtrlock/xtrlock-2.0-r1.ebuild12
-rw-r--r--x11-misc/xtrlock/xtrlock-2.0.ebuild28
4 files changed, 15 insertions, 34 deletions
diff --git a/x11-misc/xtrlock/ChangeLog b/x11-misc/xtrlock/ChangeLog
index 994277c851de..79ac276b220a 100644
--- a/x11-misc/xtrlock/ChangeLog
+++ b/x11-misc/xtrlock/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xtrlock
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.7 2005/03/29 17:50:04 luckyduck Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.8 2006/01/13 12:21:05 nelchael Exp $
+
+ 13 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xtrlock-2.0.ebuild,
+ xtrlock-2.0-r1.ebuild:
+ Fixed DEPEND for modular X, bug #118778.
29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+files/xtrlock-2.0-gcc34.patch, xtrlock-2.0-r1.ebuild:
diff --git a/x11-misc/xtrlock/files/digest-xtrlock-2.0 b/x11-misc/xtrlock/files/digest-xtrlock-2.0
deleted file mode 100644
index 169595f840ee..000000000000
--- a/x11-misc/xtrlock/files/digest-xtrlock-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e967df7e3675f045b6349ff8cb9fdf1 xtrlock_2.0-6.tar.gz 6801
diff --git a/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild b/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
index 984e4e8ccef2..eba4f0ab060f 100644
--- a/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild,v 1.7 2005/03/29 17:50:04 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0-r1.ebuild,v 1.8 2006/01/13 12:21:05 nelchael Exp $
inherit eutils flag-o-matic
@@ -14,7 +14,13 @@ LICENSE="GPL-2"
KEYWORDS="x86 ppc ~amd64"
IUSE=""
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-misc/imake )
+ virtual/x11 )"
+
+DEPEND="${RDEPEND}
+ || ( x11-proto/xproto virtual/x11 )"
src_unpack() {
unpack ${A}
diff --git a/x11-misc/xtrlock/xtrlock-2.0.ebuild b/x11-misc/xtrlock/xtrlock-2.0.ebuild
deleted file mode 100644
index d8c47f221c22..000000000000
--- a/x11-misc/xtrlock/xtrlock-2.0.ebuild
+++ /dev/null
@@ -1,28 +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/xtrlock/xtrlock-2.0.ebuild,v 1.6 2005/03/29 17:50:04 luckyduck Exp $
-
-MY_P=${P/-/_}-6
-DESCRIPTION="A simplistic screen locking program for X"
-SRC_URI="mirror://debian/dists/potato/main/source/x11/${MY_P}.tar.gz"
-HOMEPAGE="ftp://ftp.debian.org/debian/dists/stable/main/source/x11/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_compile() {
- xmkmf || die
- cp Makefile Makefile.orig
- make CFLAGS="${CFLAGS} -DSHADOW_PWD" xtrlock || die
-}
-
-src_install() {
- dobin xtrlock
- chmod u+s ${D}/usr/bin/xtrlock
- mv xtrlock.man xtrlock.1
- doman xtrlock.1
-}