summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 19:10:12 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 19:10:12 +0000
commitbe607abe2cc3d951cff3102f926826b18d02c10a (patch)
tree0c6fdf30be0904fe464d9715eb3e0992d26acc82
parentMarked ppc stable. (diff)
downloadgentoo-2-be607abe2cc3d951cff3102f926826b18d02c10a.tar.gz
gentoo-2-be607abe2cc3d951cff3102f926826b18d02c10a.tar.bz2
gentoo-2-be607abe2cc3d951cff3102f926826b18d02c10a.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
-rw-r--r--x11-misc/xtoolwait/ChangeLog6
-rw-r--r--x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild14
-rw-r--r--x11-misc/xtoolwait/xtoolwait-1.3.ebuild16
3 files changed, 30 insertions, 6 deletions
diff --git a/x11-misc/xtoolwait/ChangeLog b/x11-misc/xtoolwait/ChangeLog
index 1b7c1fa7c903..0ed33cf93e51 100644
--- a/x11-misc/xtoolwait/ChangeLog
+++ b/x11-misc/xtoolwait/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xtoolwait
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/ChangeLog,v 1.23 2006/01/06 02:21:57 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/ChangeLog,v 1.24 2006/01/21 19:10:12 nelchael Exp $
+
+ 21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xtoolwait-1.3.ebuild,
+ xtoolwait-1.3-r1.ebuild:
+ Fixed DEPEND for modular X.
06 Jan 2006; Olivier Crête <tester@gentoo.org> xtoolwait-1.3-r1.ebuild:
Stable on amd64
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild
index 02739a9f86a6..c06803c97e79 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild
@@ -1,16 +1,26 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild,v 1.8 2006/01/06 02:21:57 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild,v 1.9 2006/01/21 19:10:12 nelchael Exp $
SRC_URI="http://www.hacom.nl/~richard/software/${P}.tar.gz"
HOMEPAGE="http://www.hacom.nl/~richard/software/xtoolwait.html"
DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
-DEPEND="|| ( ( >=x11-misc/imake-1 app-text/rman ) virtual/x11 )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
IUSE=""
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXext )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( (
+ x11-misc/imake
+ x11-proto/xproto
+ app-text/rman )
+ virtual/x11 )"
+
src_compile() {
xmkmf || die "xmkmf failed"
emake || die "emake failed"
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3.ebuild
index bb1f844709c6..1e818ea0dc6c 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3.ebuild
@@ -1,16 +1,26 @@
-# 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/xtoolwait/xtoolwait-1.3.ebuild,v 1.17 2005/11/01 10:34:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3.ebuild,v 1.18 2006/01/21 19:10:12 nelchael Exp $
SRC_URI="http://www.hacom.nl/~richard/software/${P}.tar.gz"
HOMEPAGE="http://www.hacom.nl/~richard/software/xtoolwait.html"
DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
-DEPEND="virtual/x11"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 sparc alpha ia64 ~amd64 ppc"
IUSE=""
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXext )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( (
+ x11-misc/imake
+ x11-proto/xproto
+ app-text/rman )
+ virtual/x11 )"
+
src_compile() {
xmkmf || die "xmkmf failed"
emake || die "emake failed"