Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

8 files changed, 37 insertions, 50 deletions

diff --git a/x11-misc/xfm/ChangeLog b/x11-misc/xfm/ChangeLog
index 1fb481818fa7..49ef0881b34f 100644
--- a/x11-misc/xfm/ChangeLog
+++ b/x11-misc/xfm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xfm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfm/ChangeLog,v 1.7 2005/11/01 12:58:26 nelchael Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfm/ChangeLog,v 1.8 2006/01/21 17:25:47 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xfm-1.4.3.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> xfm-1.4.3.ebuild:
   Fixed dodoc not to install COPYING and/or INSTALL.
diff --git a/x11-misc/xfm/xfm-1.4.3.ebuild b/x11-misc/xfm/xfm-1.4.3.ebuild
index cdb5579ac73c..27521b1b5bf9 100644
--- a/x11-misc/xfm/xfm-1.4.3.ebuild
+++ b/x11-misc/xfm/xfm-1.4.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/xfm/xfm-1.4.3.ebuild,v 1.6 2005/11/01 12:58:26 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfm/xfm-1.4.3.ebuild,v 1.7 2006/01/21 17:25:47 nelchael Exp $
 
 inherit eutils
 
@@ -13,9 +13,20 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXp )
+	virtual/x11 )
 	x11-libs/Xaw3d"
 DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-misc/imake )
+	virtual/x11 )
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-misc/xhkeys/ChangeLog b/x11-misc/xhkeys/ChangeLog
index 3e1f3c84cb59..bd58753f1783 100644
--- a/x11-misc/xhkeys/ChangeLog
+++ b/x11-misc/xhkeys/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xhkeys
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/ChangeLog,v 1.10 2005/09/17 00:52:47 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/ChangeLog,v 1.11 2006/01/21 17:29:41 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xhkeys-1.0.0.ebuild,
+  -xhkeys-1.0.2.ebuild, xhkeys-2.2.1.ebuild:
+  Fixed DEPEND for modular X.
 
   17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/x11-misc/xhkeys/files/digest-xhkeys-1.0.0 b/x11-misc/xhkeys/files/digest-xhkeys-1.0.0
deleted file mode 100644
index 89da43cf225e..000000000000
--- a/x11-misc/xhkeys/files/digest-xhkeys-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa5fbb575716bb81208924a0e72d277c xhkeys-1.0.0.tar.gz 52264
diff --git a/x11-misc/xhkeys/files/digest-xhkeys-1.0.2 b/x11-misc/xhkeys/files/digest-xhkeys-1.0.2
deleted file mode 100644
index c144d712e429..000000000000
--- a/x11-misc/xhkeys/files/digest-xhkeys-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f3ce8e199e7b40203fffb656d097650 xhkeys-1.0.2.tar.gz 57037
diff --git a/x11-misc/xhkeys/xhkeys-1.0.0.ebuild b/x11-misc/xhkeys/xhkeys-1.0.0.ebuild
deleted file mode 100644
index 5ab3cd6eaf6a..000000000000
--- a/x11-misc/xhkeys/xhkeys-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/xhkeys-1.0.0.ebuild,v 1.3 2004/06/24 22:41:22 agriffis Exp $
-
-DESCRIPTION="assign particular actions to any key or key combination"
-HOMEPAGE="http://www.geocities.com/wmalms/"
-SRC_URI="http://www.geocities.com/wmalms/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_install() {
-	dobin xhkeys xhkconf
-	dodoc README VERSION
-}
diff --git a/x11-misc/xhkeys/xhkeys-1.0.2.ebuild b/x11-misc/xhkeys/xhkeys-1.0.2.ebuild
deleted file mode 100644
index 2a3cb127b3cd..000000000000
--- a/x11-misc/xhkeys/xhkeys-1.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/xhkeys-1.0.2.ebuild,v 1.4 2004/09/29 08:30:07 pyrania Exp $
-
-DESCRIPTION="assign particular actions to any key or key combination"
-HOMEPAGE="http://www.geocities.com/wmalms/"
-SRC_URI="http://www.geocities.com/wmalms/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_install() {
-	dobin xhkeys xhkconf
-	dodoc README VERSION
-}
diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
index 276e6689f2c8..a30f7d041f24 100644
--- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
+++ b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 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/xhkeys/xhkeys-2.2.1.ebuild,v 1.3 2004/09/29 08:30:07 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/xhkeys-2.2.1.ebuild,v 1.4 2006/01/21 17:29:41 nelchael Exp $
 
 DESCRIPTION="assign particular actions to any key or key combination"
 HOMEPAGE="http://www.geocities.com/wmalms/"
@@ -11,7 +11,16 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )"
 
 src_install() {
 	dobin xhkeys xhkconf