Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

34 files changed, 194 insertions, 177 deletions

diff --git a/x11-misc/xautomation/ChangeLog b/x11-misc/xautomation/ChangeLog
index ad5819af12e6..b36a9972ca88 100644
--- a/x11-misc/xautomation/ChangeLog
+++ b/x11-misc/xautomation/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xautomation
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/ChangeLog,v 1.14 2005/10/08 17:10:09 swegener Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/ChangeLog,v 1.15 2006/01/21 16:24:53 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -xautomation-0.93.ebuild, xautomation-0.96.ebuild:
+  Fixed DEPEND for modular X.
 
   08 Oct 2005; Sven Wegener <swegener@gentoo.org> xautomation-0.93.ebuild,
   xautomation-0.96.ebuild:
diff --git a/x11-misc/xautomation/files/digest-xautomation-0.93 b/x11-misc/xautomation/files/digest-xautomation-0.93
deleted file mode 100644
index 2ead36453a4b..000000000000
--- a/x11-misc/xautomation/files/digest-xautomation-0.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3d00203ac6ba0dabced6619fc75ad40 xautomation-0.93.tar.gz 72800
diff --git a/x11-misc/xautomation/xautomation-0.93.ebuild b/x11-misc/xautomation/xautomation-0.93.ebuild
deleted file mode 100644
index 996e5e25bc6d..000000000000
--- a/x11-misc/xautomation/xautomation-0.93.ebuild
+++ /dev/null
@@ -1,18 +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/xautomation/xautomation-0.93.ebuild,v 1.9 2005/10/08 17:10:09 swegener Exp $
-
-DESCRIPTION="Control X from command line and find things on screen"
-HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
-SRC_URI="http://hoopajoo.net/static/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ia64 ~ppc x86"
-IUSE=""
-DEPEND="virtual/x11"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog
-}
diff --git a/x11-misc/xautomation/xautomation-0.96.ebuild b/x11-misc/xautomation/xautomation-0.96.ebuild
index 6b95bdcfe330..5954bc4c53a9 100644
--- a/x11-misc/xautomation/xautomation-0.96.ebuild
+++ b/x11-misc/xautomation/xautomation-0.96.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/xautomation/xautomation-0.96.ebuild,v 1.6 2005/10/08 17:10:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/xautomation-0.96.ebuild,v 1.7 2006/01/21 16:24:53 nelchael Exp $
 
 DESCRIPTION="Control X from command line and find things on screen"
 HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
@@ -10,7 +10,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ia64 ~ppc x86"
 IUSE=""
-DEPEND="virtual/x11"
+
+RDEPEND="|| ( (
+		x11-libs/libXtst
+		x11-libs/libXt
+		x11-libs/libX11 )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )
+	media-libs/libpng"
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
diff --git a/x11-misc/xbatt/ChangeLog b/x11-misc/xbatt/ChangeLog
index 6b50f03ed994..d5ff0bca44dc 100644
--- a/x11-misc/xbatt/ChangeLog
+++ b/x11-misc/xbatt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xbatt
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbatt/ChangeLog,v 1.7 2004/11/02 05:06:30 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbatt/ChangeLog,v 1.8 2006/01/21 16:27:43 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xbatt-1.2.1.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> xbatt-1.2.1.ebuild:
   fix LICENSE; tidy
diff --git a/x11-misc/xbatt/xbatt-1.2.1.ebuild b/x11-misc/xbatt/xbatt-1.2.1.ebuild
index 5d86820ddf33..fbcdbf5cac4b 100644
--- a/x11-misc/xbatt/xbatt-1.2.1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.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/xbatt/xbatt-1.2.1.ebuild,v 1.6 2004/11/02 05:06:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbatt/xbatt-1.2.1.ebuild,v 1.7 2006/01/21 16:27:43 nelchael Exp $
 
 DESCRIPTION="Notebook battery indicator for X"
 HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
@@ -11,7 +11,17 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+		x11-libs/libXext
+		x11-libs/libxkbfile
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-misc/xbattbar/ChangeLog b/x11-misc/xbattbar/ChangeLog
index 261e5ba5fe93..3bc7db5a0d2e 100644
--- a/x11-misc/xbattbar/ChangeLog
+++ b/x11-misc/xbattbar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xbattbar
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/ChangeLog,v 1.8 2005/11/20 02:05:28 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/ChangeLog,v 1.9 2006/01/21 16:31:04 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xbattbar-1.4.2.ebuild:
+  Fixed DEPEND for modular X.
 
   20 Nov 2005; Joseph Jezak <josejx@gentoo.org> xbattbar-1.4.2.ebuild:
   Marked ppc stable for bug #111127.
diff --git a/x11-misc/xbattbar/xbattbar-1.4.2.ebuild b/x11-misc/xbattbar/xbattbar-1.4.2.ebuild
index 7e4bfa2dfbc8..e3d45afce0b6 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.2.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.2.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/xbattbar/xbattbar-1.4.2.ebuild,v 1.7 2005/11/20 02:05:28 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/xbattbar-1.4.2.ebuild,v 1.8 2006/01/21 16:31:04 nelchael Exp $
 
 IUSE=""
 
@@ -10,7 +10,16 @@ SRC_URI="http://iplab.aist-nara.ac.jp/member/suguru/${P/-/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
-DEPEND="virtual/x11"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/gccmakedep
+		x11-libs/libX11 )
+	virtual/x11 )"
 
 src_compile() {
 
diff --git a/x11-misc/xcalendar/ChangeLog b/x11-misc/xcalendar/ChangeLog
index f294d5e88463..dec9bd6fcb75 100644
--- a/x11-misc/xcalendar/ChangeLog
+++ b/x11-misc/xcalendar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xcalendar
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalendar/ChangeLog,v 1.15 2005/04/24 03:26:08 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalendar/ChangeLog,v 1.16 2006/01/21 16:34:12 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xcalendar-4.0.ebuild:
+  Fixed DEPEND for modular X.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> xcalendar-4.0.ebuild:
   Stable on ppc.
diff --git a/x11-misc/xcalendar/xcalendar-4.0.ebuild b/x11-misc/xcalendar/xcalendar-4.0.ebuild
index edbe727ee2f1..9e2494665f6b 100644
--- a/x11-misc/xcalendar/xcalendar-4.0.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0.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/xcalendar/xcalendar-4.0.ebuild,v 1.15 2005/04/24 03:26:08 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcalendar/xcalendar-4.0.ebuild,v 1.16 2006/01/21 16:34:12 nelchael Exp $
 
 inherit eutils
 
@@ -14,8 +14,16 @@ LICENSE="as-is"
 KEYWORDS="x86 alpha ~amd64 ppc64 ppc"
 IUSE="motif"
 
-DEPEND="virtual/x11
-		motif? ( x11-libs/openmotif )"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
+	motif? ( x11-libs/openmotif )"
 
 src_compile() {
 	if use motif
diff --git a/x11-misc/xcb/ChangeLog b/x11-misc/xcb/ChangeLog
index 554b316e820b..46477aa4b164 100644
--- a/x11-misc/xcb/ChangeLog
+++ b/x11-misc/xcb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xcb
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.9 2005/11/08 03:56:14 dang Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.10 2006/01/21 16:36:48 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xcb-2.4.ebuild:
+  Fixed DEPEND for modular X.
 
   08 Nov 2005; <dang@gentoo.org> xcb-2.4.ebuild:
   Marked ~amd64
diff --git a/x11-misc/xcb/xcb-2.4.ebuild b/x11-misc/xcb/xcb-2.4.ebuild
index 521c5efda38e..3a96a0db76d4 100644
--- a/x11-misc/xcb/xcb-2.4.ebuild
+++ b/x11-misc/xcb/xcb-2.4.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/xcb/xcb-2.4.ebuild,v 1.8 2005/11/08 03:56:14 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.9 2006/01/21 16:36:48 nelchael Exp $
 
 DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
 HOMEPAGE="http://www.goof.com/pcg/marc/xcb.html"
@@ -10,7 +10,14 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ~ppc x86"
 IUSE="motif"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXaw
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
 	motif? ( x11-libs/openmotif )"
 
 src_unpack() {
diff --git a/x11-misc/xclip/ChangeLog b/x11-misc/xclip/ChangeLog
index 4716a56c8ae8..846d5f2bf4c2 100644
--- a/x11-misc/xclip/ChangeLog
+++ b/x11-misc/xclip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xclip
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/ChangeLog,v 1.10 2005/10/31 16:32:58 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/ChangeLog,v 1.11 2006/01/21 16:39:43 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xclip-0.08.ebuild:
+  Fixed DEPEND for modular X.
 
   31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> -xclip-0.05.ebuild,
   xclip-0.08.ebuild:
diff --git a/x11-misc/xclip/xclip-0.08.ebuild b/x11-misc/xclip/xclip-0.08.ebuild
index bb9611ba7a6b..8b458e9d0b08 100644
--- a/x11-misc/xclip/xclip-0.08.ebuild
+++ b/x11-misc/xclip/xclip-0.08.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/xclip/xclip-0.08.ebuild,v 1.7 2005/10/31 16:32:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xclip/xclip-0.08.ebuild,v 1.8 2006/01/21 16:39:43 nelchael Exp $
 
 S=${WORKDIR}/xclip
 DESCRIPTION="Command-line utility to read data from standard in and place it in an X selection for pasting into X applications."
@@ -12,7 +12,14 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-misc/xcut/ChangeLog b/x11-misc/xcut/ChangeLog
index 43ac209c16cf..62a7adeac591 100644
--- a/x11-misc/xcut/ChangeLog
+++ b/x11-misc/xcut/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xcut
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcut/ChangeLog,v 1.4 2005/07/26 15:09:10 dholm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcut/ChangeLog,v 1.5 2006/01/21 16:42:51 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xcut-0.2.ebuild:
+  Fixed DEPEND for modular X.
 
   26 Jul 2005; David Holm <dholm@gentoo.org> xcut-0.2.ebuild:
   Added to ~ppc.
diff --git a/x11-misc/xcut/xcut-0.2.ebuild b/x11-misc/xcut/xcut-0.2.ebuild
index a5da37896c02..832d548fe76a 100644
--- a/x11-misc/xcut/xcut-0.2.ebuild
+++ b/x11-misc/xcut/xcut-0.2.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/xcut/xcut-0.2.ebuild,v 1.4 2005/07/26 15:09:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcut/xcut-0.2.ebuild,v 1.5 2006/01/21 16:42:51 nelchael Exp $
 
 inherit eutils
 
@@ -12,7 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ~ppc x86"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-misc/imake )
+	virtual/x11 )"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-misc/xdaf/ChangeLog b/x11-misc/xdaf/ChangeLog
index 7f2955c00796..2f328676817c 100644
--- a/x11-misc/xdaf/ChangeLog
+++ b/x11-misc/xdaf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdaf
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaf/ChangeLog,v 1.9 2005/11/14 21:55:19 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaf/ChangeLog,v 1.10 2006/01/21 16:46:53 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xdaf-0.01.10.ebuild,
+  xdaf-0.01.11.01.ebuild:
+  Fixed DEPEND for modular X.
 
   14 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
   xdaf-0.01.11.01.ebuild:
diff --git a/x11-misc/xdaf/files/digest-xdaf-0.01.10 b/x11-misc/xdaf/files/digest-xdaf-0.01.10
deleted file mode 100644
index d06984a5b1ac..000000000000
--- a/x11-misc/xdaf/files/digest-xdaf-0.01.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e02311423e3ffa76e366a365dde22f9 xdaf-A.01.10.tar.gz 12592
diff --git a/x11-misc/xdaf/xdaf-0.01.10.ebuild b/x11-misc/xdaf/xdaf-0.01.10.ebuild
deleted file mode 100644
index 1a5a31b13344..000000000000
--- a/x11-misc/xdaf/xdaf-0.01.10.ebuild
+++ /dev/null
@@ -1,30 +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/xdaf/xdaf-0.01.10.ebuild,v 1.8 2005/11/03 12:20:00 nelchael Exp $
-
-MY_P="${PN}-A.01.10"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Small tool to provide visual feedback of local disks activity by changing the default X11 mouse pointer"
-SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
-HOMEPAGE="http://ezix.sourceforge.net/software/xdaf.html"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	cd ${S}
-	xmkmf
-	emake || die
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodoc README
-}
diff --git a/x11-misc/xdaf/xdaf-0.01.11.01.ebuild b/x11-misc/xdaf/xdaf-0.01.11.01.ebuild
index 9d9e3a9a817b..538a08dc9a89 100644
--- a/x11-misc/xdaf/xdaf-0.01.11.01.ebuild
+++ b/x11-misc/xdaf/xdaf-0.01.11.01.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/xdaf/xdaf-0.01.11.01.ebuild,v 1.6 2005/11/14 21:55:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaf/xdaf-0.01.11.01.ebuild,v 1.7 2006/01/21 16:46:53 nelchael Exp $
 
 MY_P=${P/-0/-A}
 DESCRIPTION="Small tool to provide visual feedback of local disks activity by changing the default X11 mouse pointer"
@@ -12,7 +12,17 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXp )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-misc/imake virtual/x11 )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/x11-misc/xdaliclock/ChangeLog b/x11-misc/xdaliclock/ChangeLog
index 996b5df2796b..d354d4ccb39b 100644
--- a/x11-misc/xdaliclock/ChangeLog
+++ b/x11-misc/xdaliclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdaliclock
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaliclock/ChangeLog,v 1.9 2004/09/18 19:10:35 weeve Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaliclock/ChangeLog,v 1.10 2006/01/21 16:51:22 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -xdaliclock-2.19.ebuild, xdaliclock-2.20.ebuild:
+  Fixed DEPEND for modular X.
 
   18 Sep 2004; Jason Wever <weeve@gentoo.org> xdaliclock-2.20.ebuild:
   Stable on sparc.
diff --git a/x11-misc/xdaliclock/files/digest-xdaliclock-2.19 b/x11-misc/xdaliclock/files/digest-xdaliclock-2.19
deleted file mode 100644
index da0b52f2b38a..000000000000
--- a/x11-misc/xdaliclock/files/digest-xdaliclock-2.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e328f51e33dbdb6d00b3580be20c3ef xdaliclock-2.19.tar.gz 156844
diff --git a/x11-misc/xdaliclock/xdaliclock-2.19.ebuild b/x11-misc/xdaliclock/xdaliclock-2.19.ebuild
deleted file mode 100644
index 2eb0716dd08f..000000000000
--- a/x11-misc/xdaliclock/xdaliclock-2.19.ebuild
+++ /dev/null
@@ -1,25 +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/xdaliclock/xdaliclock-2.19.ebuild,v 1.5 2004/06/24 22:39:36 agriffis Exp $
-
-S=${WORKDIR}/${P}/X11
-DESCRIPTION=" Dali Clock is a digital clock. When a digit changes, it melts into its new shape."
-HOMEPAGE="http://www.jwz.org/xdaliclock/"
-SRC_URI="http://www.jwz.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ppc"
-
-IUSE=""
-
-DEPEND="virtual/x11"
-
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	einstall || die
-
-	dodoc README
-}
diff --git a/x11-misc/xdaliclock/xdaliclock-2.20.ebuild b/x11-misc/xdaliclock/xdaliclock-2.20.ebuild
index e75daf8817f7..7c48d9b00d0a 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.20.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.20.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/xdaliclock/xdaliclock-2.20.ebuild,v 1.8 2004/09/18 19:10:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdaliclock/xdaliclock-2.20.ebuild,v 1.9 2006/01/21 16:51:22 nelchael Exp $
 
 S=${WORKDIR}/${P}/X11
 DESCRIPTION=" Dali Clock is a digital clock. When a digit changes, it melts into its new shape."
@@ -12,7 +12,16 @@ LICENSE="BSD"
 SLOT="0"
 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() {
 	dodir /usr/bin
diff --git a/x11-misc/xdialog/ChangeLog b/x11-misc/xdialog/ChangeLog
index ef3309e53f3e..83f487380bf6 100644
--- a/x11-misc/xdialog/ChangeLog
+++ b/x11-misc/xdialog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xdialog
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdialog/ChangeLog,v 1.10 2005/07/04 01:16:36 smithj Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdialog/ChangeLog,v 1.11 2006/01/21 16:53:46 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xdialog-2.1.1.ebuild:
+  Fixed DEPEND for modular X.
 
   04 Jul 2005; Jonathan Smith <smithj@gentoo.org> +metadata.xml:
   added metadata
diff --git a/x11-misc/xdialog/xdialog-2.1.1.ebuild b/x11-misc/xdialog/xdialog-2.1.1.ebuild
index 58074a946748..a047ab0ba909 100644
--- a/x11-misc/xdialog/xdialog-2.1.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.1.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/xdialog/xdialog-2.1.1.ebuild,v 1.6 2004/09/09 06:46:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdialog/xdialog-2.1.1.ebuild,v 1.7 2006/01/21 16:53:46 nelchael Exp $
 
 DESCRIPTION="drop-in replacement for cdialog using GTK"
 HOMEPAGE="http://xdialog.dyns.net/"
@@ -11,8 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
 IUSE="nls"
 
-DEPEND="virtual/x11
-	=x11-libs/gtk+-1.2*
+DEPEND="=x11-libs/gtk+-1.2*
 	nls? ( >=sys-devel/gettext-0.10.38 )"
 
 S="${WORKDIR}/${P/x/X}"
diff --git a/x11-misc/xdiskusage/ChangeLog b/x11-misc/xdiskusage/ChangeLog
index 96ce4ecef275..8f9ce008b988 100644
--- a/x11-misc/xdiskusage/ChangeLog
+++ b/x11-misc/xdiskusage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdiskusage
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/ChangeLog,v 1.11 2005/11/15 12:19:23 nelchael Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/ChangeLog,v 1.12 2006/01/21 16:55:49 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -xdiskusage-1.46.ebuild, xdiskusage-1.48.ebuild:
+  Fixed DEPEND for modular X.
 
   16 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> xdiskusage-1.48.ebuild:
   Stable on x86.
diff --git a/x11-misc/xdiskusage/files/digest-xdiskusage-1.46 b/x11-misc/xdiskusage/files/digest-xdiskusage-1.46
deleted file mode 100644
index b13d6cdd3559..000000000000
--- a/x11-misc/xdiskusage/files/digest-xdiskusage-1.46
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5293b992d884d0f61f8be864a14c01f xdiskusage-1.46.tgz 35998
diff --git a/x11-misc/xdiskusage/xdiskusage-1.46.ebuild b/x11-misc/xdiskusage/xdiskusage-1.46.ebuild
deleted file mode 100644
index b7c761a481ab..000000000000
--- a/x11-misc/xdiskusage/xdiskusage-1.46.ebuild
+++ /dev/null
@@ -1,31 +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/xdiskusage/xdiskusage-1.46.ebuild,v 1.9 2005/09/12 00:01:15 nelchael Exp $
-
-DESCRIPTION="front end to xdu for viewing disk usage graphically under X11"
-SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
-HOMEPAGE="http://xdiskusage.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc"
-IUSE=""
-
-DEPEND="virtual/x11
-	x11-libs/fltk
-	virtual/glut"
-
-src_compile() {
-	econf || die "configure failed"
-
-	make \
-		CXXFLAGS="$CXXFLAGS `fltk-config --cxxflags`" \
-		LDLIBS="`fltk-config --ldflags`" \
-		|| die "parallel make failed"
-}
-
-src_install() {
-	dobin xdiskusage
-	doman xdiskusage.1
-	dodoc README
-}
diff --git a/x11-misc/xdiskusage/xdiskusage-1.48.ebuild b/x11-misc/xdiskusage/xdiskusage-1.48.ebuild
index 809c8cafbeb5..97b8f40cae92 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.48.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.48.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/xdiskusage/xdiskusage-1.48.ebuild,v 1.3 2005/11/15 12:19:23 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/xdiskusage-1.48.ebuild,v 1.4 2006/01/21 16:55:49 nelchael Exp $
 
 DESCRIPTION="front end to xdu for viewing disk usage graphically under X11"
 SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
@@ -11,8 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	x11-libs/fltk
+DEPEND="x11-libs/fltk
 	virtual/glut"
 
 src_compile() {
diff --git a/x11-misc/xearth/ChangeLog b/x11-misc/xearth/ChangeLog
index 108931cfa024..548ebac5f796 100644
--- a/x11-misc/xearth/ChangeLog
+++ b/x11-misc/xearth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xearth
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xearth/ChangeLog,v 1.8 2005/11/02 14:58:08 metalgod Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xearth/ChangeLog,v 1.9 2006/01/21 16:58:46 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xearth-1.1.ebuild:
+  Fixed DEPEND for modular X.
 
   02 Nov 2005; Luis Medinas <metalgod@gentoo.org> xearth-1.1.ebuild:
   Marked Stable on amd64. Bug #111126.
diff --git a/x11-misc/xearth/xearth-1.1.ebuild b/x11-misc/xearth/xearth-1.1.ebuild
index 1fe2c578ff10..a2977239fdff 100644
--- a/x11-misc/xearth/xearth-1.1.ebuild
+++ b/x11-misc/xearth/xearth-1.1.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/xearth/xearth-1.1.ebuild,v 1.7 2005/11/02 14:58:08 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xearth/xearth-1.1.ebuild,v 1.8 2006/01/21 16:58:46 nelchael Exp $
 
 HOMEPAGE="http://www.cs.colorado.edu/~tuna/xearth/"
 DESCRIPTION="Xearth sets the X root window to an image of the Earth"
@@ -12,7 +12,16 @@ LICENSE="xearth"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		11-libs/libXt
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/imake
+		x11-proto/xproto )
+	virtual/x11 )"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-misc/xfe/ChangeLog b/x11-misc/xfe/ChangeLog
index f72a696a8ef6..3a42af132893 100644
--- a/x11-misc/xfe/ChangeLog
+++ b/x11-misc/xfe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xfe
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.26 2005/12/28 20:04:24 halcy0n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.27 2006/01/21 17:01:05 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xfe-0.84.ebuild:
+  Fixed DEPEND for modular X.
 
   28 Dec 2005; Mark Loeser <halcy0n@gentoo.org> +files/xfe-0.84-gcc4.patch,
   xfe-0.84.ebuild:
diff --git a/x11-misc/xfe/xfe-0.84.ebuild b/x11-misc/xfe/xfe-0.84.ebuild
index 4e6b7344ac4a..70187d5e2340 100644
--- a/x11-misc/xfe/xfe-0.84.ebuild
+++ b/x11-misc/xfe/xfe-0.84.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/xfe/xfe-0.84.ebuild,v 1.2 2005/12/28 20:04:24 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-0.84.ebuild,v 1.3 2006/01/21 17:01:05 nelchael Exp $
 
 inherit eutils
 
@@ -14,8 +14,7 @@ KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~ppc64"
 IUSE="nls"
 
 # only fox-1.4.x is compatible with this version of xfe...
-DEPEND="virtual/x11
-	=x11-libs/fox-1.4*"
+DEPEND="=x11-libs/fox-1.4*"
 
 src_unpack()
 {