summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 18:26:19 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 18:26:19 +0000
commit62226d3580cb634bc237d694c648db31ef2ca424 (patch)
tree60ce5b22ff44c1768ac0409480149408865cabd6 /x11-misc/xrestop
parentAdded ppc keyword. bug 119455 (diff)
downloadgentoo-2-62226d3580cb634bc237d694c648db31ef2ca424.tar.gz
gentoo-2-62226d3580cb634bc237d694c648db31ef2ca424.tar.bz2
gentoo-2-62226d3580cb634bc237d694c648db31ef2ca424.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-misc/xrestop')
-rw-r--r--x11-misc/xrestop/ChangeLog8
-rw-r--r--x11-misc/xrestop/files/digest-xrestop-0.21
-rw-r--r--x11-misc/xrestop/xrestop-0.2.ebuild20
-rw-r--r--x11-misc/xrestop/xrestop-0.3.ebuild16
4 files changed, 15 insertions, 30 deletions
diff --git a/x11-misc/xrestop/ChangeLog b/x11-misc/xrestop/ChangeLog
index 336d91c87794..7b2321db04a6 100644
--- a/x11-misc/xrestop/ChangeLog
+++ b/x11-misc/xrestop/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xrestop
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.17 2005/12/12 05:10:05 spyderous Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.18 2006/01/21 18:26:19 nelchael Exp $
+
+ 21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xrestop-0.2.ebuild,
+ xrestop-0.3.ebuild:
+ Fixed DEPEND for modular X.
12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; xrestop-0.3.ebuild:
Add modular X dependencies.
diff --git a/x11-misc/xrestop/files/digest-xrestop-0.2 b/x11-misc/xrestop/files/digest-xrestop-0.2
deleted file mode 100644
index 16d4d55c5917..000000000000
--- a/x11-misc/xrestop/files/digest-xrestop-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ff774ff9cbb5997f0fb68e712dee302 xrestop-0.2.tar.gz 85110
diff --git a/x11-misc/xrestop/xrestop-0.2.ebuild b/x11-misc/xrestop/xrestop-0.2.ebuild
deleted file mode 100644
index 977cd0d677e2..000000000000
--- a/x11-misc/xrestop/xrestop-0.2.ebuild
+++ /dev/null
@@ -1,20 +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/xrestop/xrestop-0.2.ebuild,v 1.9 2005/11/01 00:01:09 nelchael Exp $
-
-IUSE=""
-
-DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
-SRC_URI="http://www.freedesktop.org/Software/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.freedesktop.org/Software/xrestop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-
-DEPEND="virtual/x11"
-
-src_install () {
- einstall || die
- dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-misc/xrestop/xrestop-0.3.ebuild b/x11-misc/xrestop/xrestop-0.3.ebuild
index e3f663a077c6..c2f615a01a28 100644
--- a/x11-misc/xrestop/xrestop-0.3.ebuild
+++ b/x11-misc/xrestop/xrestop-0.3.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/xrestop/xrestop-0.3.ebuild,v 1.11 2005/12/12 05:10:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.3.ebuild,v 1.12 2006/01/21 18:26:19 nelchael Exp $
IUSE=""
@@ -12,11 +12,13 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ppc sparc x86"
-DEPEND="|| ( ( x11-libs/libXres
- x11-libs/libXt
- )
- virtual/x11
- )"
+RDEPEND="|| ( (
+ x11-libs/libXres
+ x11-libs/libX11
+ x11-libs/libXt )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( x11-proto/xproto virtual/x11 )"
src_install () {
make DESTDIR="${D}" install || die