Changed dependency to virtual/x11 to work with x11-base/xorg-x11

22 files changed, 78 insertions, 50 deletions

diff --git a/x11-plugins/wmDownload/ChangeLog b/x11-plugins/wmDownload/ChangeLog
index 023666cabba0..11cc53709e0f 100644
--- a/x11-plugins/wmDownload/ChangeLog
+++ b/x11-plugins/wmDownload/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmDownload
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/ChangeLog,v 1.2 2003/02/12 09:38:12 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/ChangeLog,v 1.3 2004/04/13 18:34:33 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmDownload-0.1.2a.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
 *wmDownload-0.1.2a (04 Oct 2002)
 
diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild b/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild
index 986cb9def384..24f17153d9c0 100644
--- a/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild
+++ b/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild,v 1.8 2004/03/26 23:10:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild,v 1.9 2004/04/13 18:34:33 rizzo Exp $
 
 S=${WORKDIR}/wmDownload
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
 
-DEPEND="virtual/glibc x11-base/xfree x11-libs/docklib"
+DEPEND="virtual/glibc virtual/x11 x11-libs/docklib"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/x11-plugins/wmapmload/ChangeLog b/x11-plugins/wmapmload/ChangeLog
index 2f5dc5086000..c5f3bb32f078 100644
--- a/x11-plugins/wmapmload/ChangeLog
+++ b/x11-plugins/wmapmload/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmapmload
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.3 2003/06/12 22:26:01 msterret Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.4 2004/04/13 18:37:09 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmapmload-0.3.0.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
   12 Jun 2003; <msterret@gentoo.org> wmapmload-0.3.0.ebuild:
   add Header
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
index fd7651628735..eb579fe4f100 100644
--- a/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
+++ b/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Ebuild by AutoBot (autobot@midsouth.rr.com)
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild,v 1.5 2004/03/26 23:10:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild,v 1.6 2004/04/13 18:37:09 rizzo Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that monitors your apm battery status."
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmcalc/ChangeLog b/x11-plugins/wmcalc/ChangeLog
index 6680c3006598..eb53ef073914 100644
--- a/x11-plugins/wmcalc/ChangeLog
+++ b/x11-plugins/wmcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmcalc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.4 2004/03/19 10:04:28 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.5 2004/04/13 18:35:48 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmcalc-0.3.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
   19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmcalc-0.3.ebuild:
   Inherit eutils.
diff --git a/x11-plugins/wmcalc/wmcalc-0.3.ebuild b/x11-plugins/wmcalc/wmcalc-0.3.ebuild
index c1a8fe5854d7..bc7e28db2bbf 100644
--- a/x11-plugins/wmcalc/wmcalc-0.3.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.3.ebuild,v 1.8 2004/03/19 10:04:28 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.3.ebuild,v 1.9 2004/04/13 18:35:48 rizzo Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/w/wmcalc/${PN}_${PV}.orig.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 S=${WORKDIR}/${P}.orig
 
diff --git a/x11-plugins/wmclockmon/ChangeLog b/x11-plugins/wmclockmon/ChangeLog
index 271b64ccdde0..4df21013eafd 100644
--- a/x11-plugins/wmclockmon/ChangeLog
+++ b/x11-plugins/wmclockmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmclockmon
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/ChangeLog,v 1.12 2004/04/12 16:42:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/ChangeLog,v 1.13 2004/04/13 18:25:40 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmclockmon-0.3.0.ebuild,
+  wmclockmon-0.4.0.ebuild, wmclockmon-0.5.0.ebuild, wmclockmon-0.7.2.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmclockmon-0.7.2.ebuild:
   Stable on amd64.
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.3.0.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.3.0.ebuild
index f44e3f0ff115..55a620e2a0f3 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.3.0.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.3.0.ebuild,v 1.3 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.3.0.ebuild,v 1.4 2004/04/13 18:25:40 rizzo Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree
+DEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*"
 
 src_install () {
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.4.0.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.4.0.ebuild
index 40f46712a73a..71bb49f7a1a6 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.4.0.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.4.0.ebuild,v 1.3 2003/11/16 23:12:57 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.4.0.ebuild,v 1.4 2004/04/13 18:25:40 rizzo Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree
+DEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*"
 
 src_install () {
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.5.0.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.5.0.ebuild
index 0046cba65131..04f079c716fa 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.5.0.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.5.0.ebuild,v 1.2 2004/03/13 22:47:49 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.5.0.ebuild,v 1.3 2004/04/13 18:25:40 rizzo Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree
+DEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*"
 
 src_install () {
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild
index 23ba72fa9aab..2b0b713d6039 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild,v 1.2 2004/04/12 16:42:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild,v 1.3 2004/04/13 18:25:40 rizzo Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc amd64"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree
+DEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*"
 
 src_install () {
diff --git a/x11-plugins/wmium/ChangeLog b/x11-plugins/wmium/ChangeLog
index ec14d7736596..d78e92156a6f 100644
--- a/x11-plugins/wmium/ChangeLog
+++ b/x11-plugins/wmium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmium
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.3 2004/04/12 16:42:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.4 2004/04/13 18:27:58 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmium-1.0.7.ebuild,
+  wmium-1.0.8.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmium-1.0.8.ebuild:
   Removing S=
diff --git a/x11-plugins/wmium/wmium-1.0.7.ebuild b/x11-plugins/wmium/wmium-1.0.7.ebuild
index fb4373bdcb41..63767946c0c3 100644
--- a/x11-plugins/wmium/wmium-1.0.7.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.7.ebuild,v 1.2 2004/03/04 18:33:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.7.ebuild,v 1.3 2004/04/13 18:27:58 rizzo Exp $
 
 DESCRIPTION="WindowMaker DockApp/Grellm2 pluggin that fetches the DSL usage information for Australian ISP Internode"
 
@@ -17,7 +17,7 @@ KEYWORDS="x86"
 IUSE="gtk"
 
 DEPEND="virtual/glibc
-	x11-base/xfree
+	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
 	gtk? ( >=x11-libs/gtk+-2* )
@@ -25,7 +25,7 @@ DEPEND="virtual/glibc
 	gtk? ( dev-util/pkgconfig )"
 
 RDEPEND="virtual/glibc
-	x11-base/xfree
+	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
 	gtk? ( >=x11-libs/gtk+-2* )
diff --git a/x11-plugins/wmium/wmium-1.0.8.ebuild b/x11-plugins/wmium/wmium-1.0.8.ebuild
index 82f65d1d2cfd..c1616bda9f28 100644
--- a/x11-plugins/wmium/wmium-1.0.8.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.8.ebuild,v 1.2 2004/04/12 16:42:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.8.ebuild,v 1.3 2004/04/13 18:27:58 rizzo Exp $
 
 DESCRIPTION="WindowMaker DockApp/Grellm2 pluggin that fetches the DSL usage information for Australian ISP Internode"
 
@@ -17,7 +17,7 @@ KEYWORDS="x86"
 IUSE="gtk"
 
 DEPEND="virtual/glibc
-	x11-base/xfree
+	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
 	gtk? ( >=x11-libs/gtk+-2* )
@@ -25,7 +25,7 @@ DEPEND="virtual/glibc
 	gtk? ( dev-util/pkgconfig )"
 
 RDEPEND="virtual/glibc
-	x11-base/xfree
+	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
 	gtk? ( >=x11-libs/gtk+-2* )
diff --git a/x11-plugins/wmmemload/ChangeLog b/x11-plugins/wmmemload/ChangeLog
index 210fc22750ca..483a92d279dc 100644
--- a/x11-plugins/wmmemload/ChangeLog
+++ b/x11-plugins/wmmemload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemload
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.5 2004/03/13 20:33:58 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.6 2004/04/13 18:30:43 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmmemload-0.1.4.ebuild,
+  wmmemload-0.1.5.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
   13 Mar 2004; David Holm <dholm@gentoo.org> wmmemload-0.1.5.ebuild:
   Added to ~ppc.
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.4.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.4.ebuild
index 094db80c24d2..3f6c7bed2fe1 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.4.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.4.ebuild,v 1.6 2004/03/26 23:10:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.4.ebuild,v 1.7 2004/04/13 18:30:43 rizzo Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that displays memory and swap space usage."
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
index caaa567161a2..e4521de0862b 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild,v 1.4 2004/03/26 23:10:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild,v 1.5 2004/04/13 18:30:43 rizzo Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that displays memory and swap space usage."
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ~ppc"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmmemmon/ChangeLog b/x11-plugins/wmmemmon/ChangeLog
index e0dc623f067f..e3114e8d0546 100644
--- a/x11-plugins/wmmemmon/ChangeLog
+++ b/x11-plugins/wmmemmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemmon
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.5 2003/10/16 07:02:44 raker Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.6 2004/04/13 18:29:39 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmmemmon-0.7.0.ebuild,
+  wmmemmon-1.0.1.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
 *wmmemmon-1.0.1 (16 Oct 2003)
 
diff --git a/x11-plugins/wmmemmon/wmmemmon-0.7.0.ebuild b/x11-plugins/wmmemmon/wmmemmon-0.7.0.ebuild
index 4aa6083d53aa..eecdc746a6ab 100644
--- a/x11-plugins/wmmemmon/wmmemmon-0.7.0.ebuild
+++ b/x11-plugins/wmmemmon/wmmemmon-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-0.7.0.ebuild,v 1.6 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-0.7.0.ebuild,v 1.7 2004/04/13 18:29:39 rizzo Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64"
 SLOT="0"
 
-DEPEND="virtual/glibc x11-base/xfree"
+DEPEND="virtual/glibc virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild b/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
index 94c9679321cb..48f306818f09 100644
--- a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
+++ b/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.3 2004/03/26 23:10:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.4 2004/04/13 18:29:39 rizzo Exp $
 
 IUSE=""
 DESCRIPTION="A program to monitor memory/swap usages."
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64"
 SLOT="0"
 
-DEPEND="virtual/glibc x11-base/xfree"
+DEPEND="virtual/glibc virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmswallow/ChangeLog b/x11-plugins/wmswallow/ChangeLog
index e3ffdefdbe6e..8b8ce9d8e6e9 100644
--- a/x11-plugins/wmswallow/ChangeLog
+++ b/x11-plugins/wmswallow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmswallow
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.1 2003/07/17 02:49:11 raker Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.2 2004/04/13 18:31:42 rizzo Exp $
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmswallow-0.6.1.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
 *wmswallow-0.6.1 (16 Jul 2003)
 
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
index 4ca27d54f880..046db115cc17 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild,v 1.3 2004/01/04 18:36:48 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild,v 1.4 2004/04/13 18:31:42 rizzo Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
 
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 S=${WORKDIR}/wmswallow