Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

10 files changed, 33 insertions, 44 deletions

diff --git a/x11-misc/wayv/ChangeLog b/x11-misc/wayv/ChangeLog
index d8721eb229c3..212ac104ae5d 100644
--- a/x11-misc/wayv/ChangeLog
+++ b/x11-misc/wayv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/wayv
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wayv/ChangeLog,v 1.11 2005/06/20 00:19:41 smithj Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wayv/ChangeLog,v 1.12 2006/01/21 13:43:26 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wayv-0.3.ebuild,
+  wayv-0.3-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   20 Jun 2005; Jonathan Smith <smithj@gentoo.org> -wayv-0.2.ebuild,
   wayv-0.3-r1.ebuild:
diff --git a/x11-misc/wayv/files/digest-wayv-0.3 b/x11-misc/wayv/files/digest-wayv-0.3
deleted file mode 100644
index faccfd630e00..000000000000
--- a/x11-misc/wayv/files/digest-wayv-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3cff293196466144e61aa7cdfcbcaa43 wayv-0.3.tar.gz 139197
diff --git a/x11-misc/wayv/wayv-0.3-r1.ebuild b/x11-misc/wayv/wayv-0.3-r1.ebuild
index c3047c613888..2b0511ccbdf2 100644
--- a/x11-misc/wayv/wayv-0.3-r1.ebuild
+++ b/x11-misc/wayv/wayv-0.3-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/wayv/wayv-0.3-r1.ebuild,v 1.2 2005/06/20 00:19:41 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wayv/wayv-0.3-r1.ebuild,v 1.3 2006/01/21 13:43:26 nelchael Exp $
 
 DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X"
 HOMEPAGE="http://www.stressbunny.com/wayv"
@@ -10,8 +10,12 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/x11 virtual/libc"
-RDEPEND=""
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXtst )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_install() {
 	einstall || die
diff --git a/x11-misc/wayv/wayv-0.3.ebuild b/x11-misc/wayv/wayv-0.3.ebuild
deleted file mode 100644
index e6ab83db3bd6..000000000000
--- a/x11-misc/wayv/wayv-0.3.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/wayv/wayv-0.3.ebuild,v 1.5 2005/05/08 20:11:45 wormo Exp $
-
-DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X"
-HOMEPAGE="http://www.stressbunny.com/wayv"
-SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND="virtual/x11 virtual/libc"
-RDEPEND=""
-
-src_install() {
-	einstall || die
-}
diff --git a/x11-misc/wdm/ChangeLog b/x11-misc/wdm/ChangeLog
index f7418c89607b..f748a5abccac 100644
--- a/x11-misc/wdm/ChangeLog
+++ b/x11-misc/wdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/wdm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.19 2005/11/14 21:53:52 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.20 2006/01/21 13:45:31 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wdm-1.26-r1.ebuild,
+  wdm-1.28.ebuild:
+  Fixed DEPEND for modular X.
 
   14 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> wdm-1.28.ebuild:
   Stable on ppc. See bug #111349.
diff --git a/x11-misc/wdm/wdm-1.26-r1.ebuild b/x11-misc/wdm/wdm-1.26-r1.ebuild
index ac1840529ee9..341bceab7d7b 100644
--- a/x11-misc/wdm/wdm-1.26-r1.ebuild
+++ b/x11-misc/wdm/wdm-1.26-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/wdm/wdm-1.26-r1.ebuild,v 1.5 2005/09/17 02:03:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.26-r1.ebuild,v 1.6 2006/01/21 13:45:31 nelchael Exp $
 
 inherit eutils pam
 
@@ -15,7 +15,6 @@ KEYWORDS="alpha ~amd64 x86"
 LICENSE="GPL-2"
 
 RDEPEND=">=x11-wm/windowmaker-0.65.1
-	virtual/x11
 	truetype? ( virtual/xft )
 	pam? ( sys-libs/pam )"
 
diff --git a/x11-misc/wdm/wdm-1.28.ebuild b/x11-misc/wdm/wdm-1.28.ebuild
index 622b6e7029d8..21db1ca2253e 100644
--- a/x11-misc/wdm/wdm-1.28.ebuild
+++ b/x11-misc/wdm/wdm-1.28.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/wdm/wdm-1.28.ebuild,v 1.5 2005/11/14 21:53:52 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.28.ebuild,v 1.6 2006/01/21 13:45:31 nelchael Exp $
 
 inherit eutils pam
 
@@ -15,7 +15,6 @@ KEYWORDS="~alpha amd64 ppc x86"
 LICENSE="GPL-2"
 
 RDEPEND=">=x11-wm/windowmaker-0.70.0
-	virtual/x11
 	truetype? ( virtual/xft )
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/wininfo/ChangeLog b/x11-misc/wininfo/ChangeLog
index 55f2d6e605fd..4546d700edd6 100644
--- a/x11-misc/wininfo/ChangeLog
+++ b/x11-misc/wininfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/wininfo
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wininfo/ChangeLog,v 1.6 2005/12/10 15:48:46 metalgod Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wininfo/ChangeLog,v 1.7 2006/01/21 13:46:48 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wininfo-0.7.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Dec 2005; Luis Medinas <metalgod@gentoo.org> wininfo-0.7.ebuild:
   Added ~amd64 keyword.
diff --git a/x11-misc/wininfo/wininfo-0.7.ebuild b/x11-misc/wininfo/wininfo-0.7.ebuild
index b457ce017e76..390896e649e5 100644
--- a/x11-misc/wininfo/wininfo-0.7.ebuild
+++ b/x11-misc/wininfo/wininfo-0.7.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/wininfo/wininfo-0.7.ebuild,v 1.7 2005/12/10 15:48:46 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wininfo/wininfo-0.7.ebuild,v 1.8 2006/01/21 13:46:48 nelchael Exp $
 
 IUSE=""
 
@@ -10,8 +10,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-DEPEND="virtual/x11
-		>=x11-libs/gtk+-2"
+DEPEND=">=x11-libs/gtk+-2"
 
 src_install() {
 
diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest
index 8452b6218864..ba481c340459 100644
--- a/x11-misc/wmakerconf/Manifest
+++ b/x11-misc/wmakerconf/Manifest
@@ -1,8 +1,4 @@
-MD5 c3371744ab1de9b005e842d6f5e6e40b ChangeLog 3551
+MD5 439269d7759030e5aa88145bbe11f603 ChangeLog 3687
 MD5 08460ad64726481d73b93e68c86d20f3 files/digest-wmakerconf-2.11 67
-MD5 1e9fc0f7bee345603a1202c29ea3f14e files/digest-wmakerconf-2.8.1-r2 68
-MD5 9836fda7307d1de81541a6ce1f894070 files/digest-wmakerconf-2.9.2 68
 MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231
 MD5 698b122faa88c65f5a549bff439ab704 wmakerconf-2.11.ebuild 1179
-MD5 62f2137c705ffc70b14be88b6cd06bb4 wmakerconf-2.8.1-r2.ebuild 1247
-MD5 11a880b251a264c517ab53f576bcceee wmakerconf-2.9.2.ebuild 1228