moved WindowMaker dockapps from x11-misc to x11-plugins

95 files changed, 399 insertions, 416 deletions

diff --git a/profiles/updates/3Q-2002 b/profiles/updates/3Q-2002
index e78f9c58593d..73a5690b0352 100644
--- a/profiles/updates/3Q-2002
+++ b/profiles/updates/3Q-2002
@@ -25,3 +25,26 @@ move x11-misc/gkrellscore x11-plugins/gkrellscore
 move x11-misc/gkrellshoot x11-plugins/gkrellshoot
 move x11-misc/gkrellsun x11-plugins/gkrellsun
 move x11-misc/gkrellweather x11-plugins/gkrellweather
+move x11-misc/gkleds x11-plugins/gkleds
+move x11-misc/gklmsensors x11-plugins/gklmsensors
+move x11-misc/glogwatch x11-plugins/glogwatch
+move x11-misc/wmCalClock x11-plugins/wmCalClock
+move x11-misc/wmMatrix x11-plugins/wmMatrix
+move x11-misc/wmalms x11-plugins/wmalms
+move x11-misc/wmapm x11-plugins/wmapm
+move x11-misc/wmappl x11-plugins/wmappl
+move x11-misc/wmbatppc x11-plugins/wmbatppc
+move x11-misc/wmbattery x11-plugins/wmbattery
+move x11-misc/wmbiff x11-plugins/wmbiff
+move x11-misc/wmcms x11-plugins/wmcms
+move x11-misc/wmfishtime x11-plugins/wmfishtime
+move x11-misc/wmifs x11-plugins/wmifs
+move x11-misc/wmmail x11-plugins/wmmail
+move x11-misc/wmmixer-alsa x11-plugins/wmmixer-alsa
+move x11-misc/wmmon x11-plugins/wmmon
+move x11-misc/wmnet x11-plugins/wmnet
+move x11-misc/wmnetselect x11-plugins/wmnetselect
+move x11-misc/wmpinboard x11-plugins/wmpinboard
+move x11-misc/wmppp x11-plugins/wmppp
+move x11-misc/wmsysmon x11-plugins/wmsysmon
+move x11-misc/wmweather x11-plugins/wmweather
diff --git a/x11-misc/gklmsensors/gklmsensors-0.1.ebuild b/x11-misc/gklmsensors/gklmsensors-0.1.ebuild
deleted file mode 100644
index 41652ecb4f13..000000000000
--- a/x11-misc/gklmsensors/gklmsensors-0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2002 Robin Cull
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gklmsensors/gklmsensors-0.1.ebuild,v 1.4 2002/08/14 23:44:15 murphy Exp $
-
-S=${WORKDIR}/gklmsensors
-DESCRIPTION="A GKrellm plugin for monitoring lm_sensors"
-HOMEPAGE="http://sourceforge.net/projects/gklmsensors"
-
-SRC_URI1="http://telia.dl.sourceforge.net/sourceforge/gklmsensors/${P}.tar.bz2"
-SRC_URI2="http://unc.dl.sourceforge.net/sourceforge/gklmsensors/${P}.tar.bz2"
-SRC_URI3="http://belnet.dl.sourceforge.net/sourceforge/gklmsensors/${P}.tar.bz2"
-SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND=">=app-admin/gkrellm-1.0.6
-		>=sys-apps/lm_sensors-2.6.3"
-
-src_compile() {
-	emake all || die
-}
-
-src_install() {
-	insinto /usr/lib/gkrellm/plugins
-	doins sensors.so	
-}
-
diff --git a/x11-misc/glogwatch/ChangeLog b/x11-misc/glogwatch/ChangeLog
deleted file mode 100644
index 8a2533e86ba3..000000000000
--- a/x11-misc/glogwatch/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-# ChangeLog for x11-misc/glogwatch
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glogwatch/ChangeLog,v 1.1 2002/02/20 02:50:33 agriffis Exp $
-
-*glogwatch-1.0 (19 Feb 2002)
-
-	19 Feb 2002; Aron Griffis <agriffis@gentoo.org> glogwatch-1.0.ebuild:
-
-	Added glogwatch plugin for gkrellm.  Thanks to Seemant Kulleen for the
-	ebuild.
diff --git a/x11-misc/wmMatrix/ChangeLog b/x11-misc/wmMatrix/ChangeLog
deleted file mode 100644
index 7514287524dd..000000000000
--- a/x11-misc/wmMatrix/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmMatrix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmMatrix/ChangeLog,v 1.2 2002/02/07 13:13:00 vitaly Exp $
-
-*wmMatrix-0.2 (7-Feb-2002)
-
-  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmMatrix-0.2.ebuild :
-  
-  Just added to portage.
diff --git a/x11-misc/wmakerconf/ChangeLog b/x11-misc/wmakerconf/ChangeLog
deleted file mode 100644
index 875d4075bf1c..000000000000
--- a/x11-misc/wmakerconf/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-# ChangeLog for x11-misc/wmakerconf
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmakerconf/ChangeLog,v 1.3 2002/07/17 05:40:08 raker Exp $
-
-*wmakerconf-2.9 (16 Jul 2002)
-
-  16 Jul 2002; Nick Hadaway <raker@gentoo.org>
-  wmakerconf-2.9.ebuild, files/digest-wmakerconf-2.9 :
-
-  Updated to latest version.  We don't have libwmfun support yet.
-
-*wmakerconf-2.8.1-r2 (19 Jun 2002)
-
-  19 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
-  wmakerconf-2.8.1-r2.ebuild files/digest-wmakerconf-2.8.1-r2 :
-
-  Fixed bug #3909 by info@cs-ol.de (Udo Mu"ller) to make the Gnome1 DEPEND
-  listing a little cleaner.
-
-*wmakerconf-2.8.1-r1
-
-  1 Apr 2002; Seemant Kulleen <seemant@gentoo.org> wmakerconf-2.8.1-r1.ebuild :
-
-  Fixed sandbox violations and corrected the dependencies and USE dependent
-  compilations.
diff --git a/x11-misc/wmakerconf/files/digest-wmakerconf-2.8.1-r2 b/x11-misc/wmakerconf/files/digest-wmakerconf-2.8.1-r2
deleted file mode 100644
index f3b723c38256..000000000000
--- a/x11-misc/wmakerconf/files/digest-wmakerconf-2.8.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03749f08953638ed2a0ab260a407d264 wmakerconf-2.8.1.tar.gz 666175
diff --git a/x11-misc/wmakerconf/files/digest-wmakerconf-2.9 b/x11-misc/wmakerconf/files/digest-wmakerconf-2.9
deleted file mode 100644
index f5f56ab84608..000000000000
--- a/x11-misc/wmakerconf/files/digest-wmakerconf-2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da02991fc9e8e09c99c1d159f45afe1e wmakerconf-2.9.tar.bz2 499800
diff --git a/x11-misc/wmakerconf/wmakerconf-2.8.1-r2.ebuild b/x11-misc/wmakerconf/wmakerconf-2.8.1-r2.ebuild
deleted file mode 100644
index 2bacce0ecf66..000000000000
--- a/x11-misc/wmakerconf/wmakerconf-2.8.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmakerconf/wmakerconf-2.8.1-r2.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X based config tool for the windowmaker X windowmanager."
-SRC_URI="http://wmaker.orcon.net.nz/current/${P}.tar.gz"
-HOMEPAGE="http://ulli.on.openave.net/wmakerconf/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	x11-wm/WindowMaker 
-	x11-libs/libPropList
-	gnome? ( =gnome-base/gnome-libs-1.4* )
-	imlib? ( media-libs/imlib )"
-	
-
-RDEPEND="nls? ( sys-devel/gettext )
-	perl? ( sys-devel/perl
-		net-misc/wget )"
-
-src_compile() {
-
-	local myconf
-
-	use nls	|| myconf="${myconf} --disable-nls"
-
-	use imlib || myconf="${myconf} --disable-imlibtest"
-	
-	use gnome || myconf="${myconf} --without-gnome"
-
-	./configure	\
-		--prefix=/usr 	\
-		--host=${CHOST}	\
-		--with-wmakerdataprefix=/usr/share	\
-		--sysconfdir=/etc	\
-		${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-	
-	make 	\
-			prefix=${D}/usr 	\
-			GNOMEDIR=${D}/usr/share/gnome/apps/Settings	\
-			install || die
-
-	dodoc README MANUAL AUTHORS TODO COPYING ChangeLog
-		dohtml -r .
-}
diff --git a/x11-misc/wmakerconf/wmakerconf-2.9.ebuild b/x11-misc/wmakerconf/wmakerconf-2.9.ebuild
deleted file mode 100644
index b8a9a031a998..000000000000
--- a/x11-misc/wmakerconf/wmakerconf-2.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmakerconf/wmakerconf-2.9.ebuild,v 1.3 2002/08/14 23:44:15 murphy Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X based config tool for the windowmaker X windowmanager."
-SRC_URI="http://www.windowmaker.org/pub/contrib/source/wmakerconf/${P}.tar.bz2"
-# Homepage appears not to be up anymore
-HOMEPAGE="http://ulli.on.openave.net/wmakerconf/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	x11-wm/WindowMaker 
-	gnome? ( =gnome-base/gnome-libs-1.4* )
-	imlib? ( media-libs/imlib )"
-	
-
-RDEPEND="nls? ( sys-devel/gettext )
-	perl? ( sys-devel/perl
-		net-misc/wget )"
-
-src_compile() {
-
-	local myconf
-
-	use nls	|| myconf="${myconf} --disable-nls"
-
-	use imlib || myconf="${myconf} --disable-imlibtest"
-	
-	use gnome || myconf="${myconf} --without-gnome"
-
-	./configure	\
-		--prefix=/usr 	\
-		--host=${CHOST}	\
-		--sysconfdir=/etc	\
-		${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-	
-	make 	\
-			prefix=${D}/usr 	\
-			GNOMEDIR=${D}/usr/share/gnome/apps/Settings	\
-			install || die
-
-	dodoc README MANUAL AUTHORS TODO COPYING ChangeLog
-		dohtml -r .
-}
diff --git a/x11-misc/wmbiff/ChangeLog b/x11-misc/wmbiff/ChangeLog
deleted file mode 100644
index fb1d6a6d72af..000000000000
--- a/x11-misc/wmbiff/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmbiff
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmbiff/ChangeLog,v 1.2 2002/02/07 13:13:00 vitaly Exp $
-
-*wmbiff-0.3.5 (7-Feb-2002)
-
-  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmbiff-0.3.5.ebuild :
-  
-  Just added to portage.
diff --git a/x11-misc/wmifs/ChangeLog b/x11-misc/wmifs/ChangeLog
deleted file mode 100644
index b3435488d4cf..000000000000
--- a/x11-misc/wmifs/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmapm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmifs/ChangeLog,v 1.1 2002/02/03 13:46:51 vitaly Exp $
-
-*wmifs-1.3_beta1 (3 Feb 2002)
-
-  3 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org>:
-  
-  Initial ebuild revision.
diff --git a/x11-misc/wmmail/ChangeLog b/x11-misc/wmmail/ChangeLog
deleted file mode 100644
index 5b40489c458b..000000000000
--- a/x11-misc/wmmail/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmmail
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmmail/ChangeLog,v 1.2 2002/02/19 16:48:05 agenkin Exp $
-
-*wmmail-0.64 (19-Feb-2002)
-
-  19 Feb 2002; Arcady Genkin <agenkin@thpoon.com> wmmail-0.64.ebuild :
-
-  Initial version of this package.
diff --git a/x11-misc/wmmixer-alsa/ChangeLog b/x11-misc/wmmixer-alsa/ChangeLog
deleted file mode 100644
index bfd1c6c51b9f..000000000000
--- a/x11-misc/wmmixer-alsa/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmmixer-alsa
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmmixer-alsa/ChangeLog,v 1.2 2002/02/07 13:13:00 vitaly Exp $
-
-*wmmixer-alsa-0.6 (7-Feb-2002)
-
-  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmmixer-alsa-0.6.ebuild :
-  
-  Just added to portage.
diff --git a/x11-misc/wmnet/ChangeLog b/x11-misc/wmnet/ChangeLog
deleted file mode 100644
index 74d84b6a6ccc..000000000000
--- a/x11-misc/wmnet/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmnet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmnet/ChangeLog,v 1.1 2002/06/09 03:12:08 woodchip Exp $
-
-*wmnet-1.06.ebuild (8 Jun 2002)
-
-  8 Jun 2002; Donny Davies <woodchip@gentoo.org> :
-
-  New port from eyez@infinite.fsw.leidenuniv.nl (Y-z).
diff --git a/x11-misc/wmpinboard/ChangeLog b/x11-misc/wmpinboard/ChangeLog
deleted file mode 100644
index 5e96ef8504f5..000000000000
--- a/x11-misc/wmpinboard/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmpinboard
-# Author: José Alberto Suárez López <bass@gentoo.org>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmpinboard/ChangeLog,v 1.1 2002/07/08 14:42:43 aliz Exp $
-
-*wmpinboard-1.0 (26 May 2002)
-
-  26 May 2002; J.Alberto S.L. <bass@gentoo.org> wmpinboard-1.0.ebuild:
-	First relase.
diff --git a/x11-misc/wmppp/ChangeLog b/x11-misc/wmppp/ChangeLog
deleted file mode 100644
index ab64c0f8c478..000000000000
--- a/x11-misc/wmppp/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for x11-misc/wmppp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmppp/ChangeLog,v 1.2 2002/02/07 13:13:00 vitaly Exp $
-
-*wmppp-1.3.0 (7-Feb-2002)
-
-  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmppp-1.3.0.ebuild :
-  
-  Just added to portage.
diff --git a/x11-misc/gkleds/ChangeLog b/x11-plugins/gkleds/ChangeLog
index 5e3cf49bd9ba..d7c69ce70ac6 100644
--- a/x11-misc/gkleds/ChangeLog
+++ b/x11-plugins/gkleds/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/gkleds
+# ChangeLog for x11-plugins/gkleds
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gkleds/ChangeLog,v 1.1 2002/05/24 06:27:42 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkleds/ChangeLog,v 1.1 2002/08/30 07:44:12 seemant Exp $
 
 *gkleds-0.6.1 (22 May 2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Moved to x11-plugins
+
   22 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/x11-misc/gkleds/files/digest-gkleds-0.6.1 b/x11-plugins/gkleds/files/digest-gkleds-0.6.1
index b5ee9c0bf2ed..b5ee9c0bf2ed 100644
--- a/x11-misc/gkleds/files/digest-gkleds-0.6.1
+++ b/x11-plugins/gkleds/files/digest-gkleds-0.6.1
diff --git a/x11-misc/gkleds/gkleds-0.6.1.ebuild b/x11-plugins/gkleds/gkleds-0.6.1.ebuild
index 25cdf965713a..4e7b8e645dd9 100644
--- a/x11-misc/gkleds/gkleds-0.6.1.ebuild
+++ b/x11-plugins/gkleds/gkleds-0.6.1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Written by Erik Grinaker <erikg@wired-networks.net>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gkleds/gkleds-0.6.1.ebuild,v 1.4 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkleds/gkleds-0.6.1.ebuild,v 1.1 2002/08/30 07:44:12 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gkrellm plugin for monitoring keyboard LEDs"
 SRC_URI="http://www.stud.ifi.uio.no/~oyvinha/gkleds/${P}.tar.gz"
 HOMEPAGE="http://www.stud.ifi.uio.no/~oyvinha/gkleds/"
-DEPEND="app-admin/gkrellm"
+
+DEPEND="=app-admin/gkrellm-1.2*"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc sparc64"
@@ -17,8 +18,8 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p ${D}/usr/lib/gkrellm/plugins || die
-	cp gkleds.so ${D}/usr/lib/gkrellm/plugins/ || die
+	insinto /usr/lib/gkrellm/plugins
+	doinst gkleds.so
 
 	dodoc COPYING Changelog License TODO INSTALL README
 }
diff --git a/x11-misc/gklmsensors/ChangeLog b/x11-plugins/gklmsensors/ChangeLog
index 310d2335e6cc..c06be7f57fd5 100644
--- a/x11-misc/gklmsensors/ChangeLog
+++ b/x11-plugins/gklmsensors/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# ChangeLog for x11-plugins/gklmsensors
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gklmsensors/ChangeLog,v 1.1 2002/05/21 08:21:00 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gklmsensors/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *gklmsensors-0.1 (21 May 2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   21 May 2002; Bruce A. Locke <blocke@shivan.org> gklmsensors-0.1.ebuild.ebuild :
 
   Contributed by robin@digitalevacuation.org (Robin Cull)
diff --git a/x11-misc/gklmsensors/files/digest-gklmsensors-0.1 b/x11-plugins/gklmsensors/files/digest-gklmsensors-0.1
index b76e931dcce3..b76e931dcce3 100644
--- a/x11-misc/gklmsensors/files/digest-gklmsensors-0.1
+++ b/x11-plugins/gklmsensors/files/digest-gklmsensors-0.1
diff --git a/x11-plugins/gklmsensors/gklmsensors-0.1.ebuild b/x11-plugins/gklmsensors/gklmsensors-0.1.ebuild
new file mode 100644
index 000000000000..0771de2a3ad0
--- /dev/null
+++ b/x11-plugins/gklmsensors/gklmsensors-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2002 Robin Cull
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gklmsensors/gklmsensors-0.1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+S=${WORKDIR}/gklmsensors
+DESCRIPTION="A GKrellm plugin for monitoring lm_sensors"
+HOMEPAGE="http://sourceforge.net/projects/gklmsensors"
+SRC_URI="mirror://sourceforge/gklmsensors/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc sparc64"
+
+DEPEND="=app-admin/gkrellm-1.2*
+	>=sys-apps/lm_sensors-2.6.3"
+
+src_compile() {
+	emake all || die
+}
+
+src_install() {
+	insinto /usr/lib/gkrellm/plugins
+	doins sensors.so	
+}
diff --git a/x11-plugins/glogwatch/ChangeLog b/x11-plugins/glogwatch/ChangeLog
new file mode 100644
index 000000000000..3c3a6e33d975
--- /dev/null
+++ b/x11-plugins/glogwatch/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for x11-plugins/glogwatch
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/glogwatch/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*glogwatch-1.0 (19 Feb 2002)
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  19 Feb 2002; Aron Griffis <agriffis@gentoo.org> glogwatch-1.0.ebuild:
+
+  Added glogwatch plugin for gkrellm.  Thanks to Seemant Kulleen for the
+  ebuild.
diff --git a/x11-misc/glogwatch/files/digest-glogwatch-1.0 b/x11-plugins/glogwatch/files/digest-glogwatch-1.0
index 0c0340d834e8..0c0340d834e8 100644
--- a/x11-misc/glogwatch/files/digest-glogwatch-1.0
+++ b/x11-plugins/glogwatch/files/digest-glogwatch-1.0
diff --git a/x11-misc/glogwatch/glogwatch-1.0.ebuild b/x11-plugins/glogwatch/glogwatch-1.0.ebuild
index cb4162bca88a..d06901c3e270 100644
--- a/x11-misc/glogwatch/glogwatch-1.0.ebuild
+++ b/x11-plugins/glogwatch/glogwatch-1.0.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glogwatch/glogwatch-1.0.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/glogwatch/glogwatch-1.0.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Gkrellm plugin that tracks a log file."
 SRC_URI="http://www.uberh4x0r.org/download/gkrellm/${P}.tar.gz"
 HOMEPAGE="http://www.uberh4x0r.org/download/gkrellm"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.10-r1"
+DEPEND="=app-admin/gkrellm-1.2*"
 
 src_compile() {
 	emake || die
diff --git a/x11-misc/wmCalClock/ChangeLog b/x11-plugins/wmCalClock/ChangeLog
index fa3f61591d57..f9113d60f291 100644
--- a/x11-misc/wmCalClock/ChangeLog
+++ b/x11-plugins/wmCalClock/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmCalClock
+# ChangeLog for x11-plugins/wmCalClock
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmCalClock/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmCalClock-1.25 (1 Feb 2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/x11-misc/wmCalClock/files/digest-wmCalClock-1.25 b/x11-plugins/wmCalClock/files/digest-wmCalClock-1.25
index c83f0cf528b3..c83f0cf528b3 100644
--- a/x11-misc/wmCalClock/files/digest-wmCalClock-1.25
+++ b/x11-plugins/wmCalClock/files/digest-wmCalClock-1.25
diff --git a/x11-misc/wmCalClock/wmCalClock-1.25.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25.ebuild
index f806465464bc..520b7e49b060 100644
--- a/x11-misc/wmCalClock/wmCalClock-1.25.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2001 Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmCalClock/wmCalClock-1.25.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/wmCalClock-1.25.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}/Src
-
 DESCRIPTION="WMaker DockApp: A Calendar clock with antialiased text."
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
-DEPEND="x11-base/xfree"
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-plugins/wmMatrix/ChangeLog b/x11-plugins/wmMatrix/ChangeLog
new file mode 100644
index 000000000000..ef7d2f16aa22
--- /dev/null
+++ b/x11-plugins/wmMatrix/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for x11-plugins/wmMatrix
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmMatrix-0.2 (7-Feb-2002)
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmMatrix-0.2.ebuild :
+  
+  Just added to portage.
diff --git a/x11-misc/wmMatrix/files/digest-wmMatrix-0.2 b/x11-plugins/wmMatrix/files/digest-wmMatrix-0.2
index 63e6f1ac84f4..63e6f1ac84f4 100644
--- a/x11-misc/wmMatrix/files/digest-wmMatrix-0.2
+++ b/x11-plugins/wmMatrix/files/digest-wmMatrix-0.2
diff --git a/x11-misc/wmMatrix/wmMatrix-0.2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
index ada17c1b41e6..e377e2cdb106 100644
--- a/x11-misc/wmMatrix/wmMatrix-0.2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
@@ -1,15 +1,16 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmMatrix/wmMatrix-0.2.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack."
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
-DEPEND="virtual/glibc x11-base/xfree"
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmalms/ChangeLog b/x11-plugins/wmalms/ChangeLog
index fe26ab42d50c..6533e20163ac 100644
--- a/x11-misc/wmalms/ChangeLog
+++ b/x11-plugins/wmalms/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmalms
+# ChangeLog for x11-plugins/wmalms
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmalms/ChangeLog,v 1.3 2002/07/19 22:51:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmalms-1.0.0a-r1 (6 Jun 2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   19 Jul 2002; Brandon Low <lostlogic@gentoo.org> wmalms-1.0.0a-r1.ebuild :
 
   add dependency on lm_sensors
diff --git a/x11-misc/wmalms/files/digest-wmalms-1.0.0a-r1 b/x11-plugins/wmalms/files/digest-wmalms-1.0.0a-r1
index 33e98875a532..33e98875a532 100644
--- a/x11-misc/wmalms/files/digest-wmalms-1.0.0a-r1
+++ b/x11-plugins/wmalms/files/digest-wmalms-1.0.0a-r1
diff --git a/x11-misc/wmalms/wmalms-1.0.0a-r1.ebuild b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
index 68cc84be27ee..47821dd65ed6 100644
--- a/x11-misc/wmalms/wmalms-1.0.0a-r1.ebuild
+++ b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
@@ -1,18 +1,19 @@
+# Copyright 2002, Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.4 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="wmalms X-windows hardware sensors applet"
-DEPEND="x11-base/xfree
+HOMEPAGE="http://www.geocities.com/wmalms"
+SRC_URI="http://www.geocities.com/wmalms/wmalms-1.0.0a.tar.gz"
+
+DEPEND="virtual/x11
 	sys-apps/lm_sensors"
-RDEPEND="${DEPEND}"
-LICENSE="GPL"
+
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc sparc64"
 
-S=${WORKDIR}/${P}
-SRC_URI="http://www.geocities.com/wmalms/wmalms-1.0.0a.tar.gz"
-HOMEPAGE="http://www.geocities.com/wmalms"
-
 src_compile() {
 	econf || die
 	emake || die
diff --git a/x11-misc/wmapm/ChangeLog b/x11-plugins/wmapm/ChangeLog
index 5532b7ae7a37..8b4257e716d0 100644
--- a/x11-misc/wmapm/ChangeLog
+++ b/x11-plugins/wmapm/ChangeLog
@@ -1,8 +1,12 @@
-# ChangeLog for x11-misc/wmapm
+# ChangeLog for x11-plugins/wmapm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmapm/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmapm-3.1 (1 Feb 2002)
+  
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
diff --git a/x11-misc/wmapm/files/digest-wmapm-3.1 b/x11-plugins/wmapm/files/digest-wmapm-3.1
index 377c50dcf695..377c50dcf695 100644
--- a/x11-misc/wmapm/files/digest-wmapm-3.1
+++ b/x11-plugins/wmapm/files/digest-wmapm-3.1
diff --git a/x11-misc/wmapm/wmapm-3.1.ebuild b/x11-plugins/wmapm/wmapm-3.1.ebuild
index 9817081c24da..e0e8ca41ebe2 100644
--- a/x11-misc/wmapm/wmapm-3.1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2001 Vitaly Kushneriuk
+# Copyright 1999-2002 Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmapm/wmapm-3.1.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/wmapm-3.1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}/wmapm
-
 DESCRIPTION="WMaker DockApp: Battery/Power status monitor for laptops"
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
-DEPEND="x11-base/xfree"
+
+DEPEND="virtual/x11"
 LICENSE="GPL-2"
 SLOT="0"
+
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmappl/ChangeLog b/x11-plugins/wmappl/ChangeLog
index a67db227bc14..1624d0f5a7d3 100644
--- a/x11-misc/wmappl/ChangeLog
+++ b/x11-plugins/wmappl/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for x11-misc/wmappl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmappl/ChangeLog,v 1.2 2002/02/07 13:13:00 vitaly Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmappl-0.6 (7-Feb-2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmappl-0.6.ebuild :
   
   Just added to portage.
diff --git a/x11-misc/wmappl/files/digest-wmappl-0.6 b/x11-plugins/wmappl/files/digest-wmappl-0.6
index 98d4d1190544..98d4d1190544 100644
--- a/x11-misc/wmappl/files/digest-wmappl-0.6
+++ b/x11-plugins/wmappl/files/digest-wmappl-0.6
diff --git a/x11-misc/wmappl/wmappl-0.6.ebuild b/x11-plugins/wmappl/wmappl-0.6.ebuild
index fa959bad3982..51466b056ff9 100644
--- a/x11-misc/wmappl/wmappl-0.6.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.6.ebuild
@@ -1,13 +1,14 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmappl/wmappl-0.6.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.6.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="Simple application launcher for the Window Maker dock."
 SRC_URI="http://www.upl.cs.wisc.edu/~charkins/wmappl/${P}.tar.gz"
 HOMEPAGE="http://www.pobox.com/~charkins/wmappl.html"
-DEPEND="x11-base/xfree virtual/glibc"
+
+DEPEND="virtual/x11"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc sparc64"
diff --git a/x11-misc/wmbatppc/ChangeLog b/x11-plugins/wmbatppc/ChangeLog
index c71549d5ea58..d140bb0c9005 100644
--- a/x11-misc/wmbatppc/ChangeLog
+++ b/x11-plugins/wmbatppc/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmbatppc
+# ChangeLog for x11-plugins/wmbatppc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmbatppc/ChangeLog,v 1.1 2002/07/08 14:41:14 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmbatppc-1.0-r1 (04 Jun 2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   04 Jun 2002; Olivier Reisch <doctomoe@gentoo.org> wmbatppc-1.0-r1.ebuild:
 
   Initial release of the wmbatppc ebuild. Thanks to theim@umd.umich.edu
diff --git a/x11-misc/wmbatppc/files/digest-wmbatppc-1.0-r1 b/x11-plugins/wmbatppc/files/digest-wmbatppc-1.0-r1
index 6195afc82742..6195afc82742 100644
--- a/x11-misc/wmbatppc/files/digest-wmbatppc-1.0-r1
+++ b/x11-plugins/wmbatppc/files/digest-wmbatppc-1.0-r1
diff --git a/x11-misc/wmbatppc/wmbatppc-1.0-r1.ebuild b/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
index 0c6158b4252e..bf4675afbccf 100644
--- a/x11-misc/wmbatppc/wmbatppc-1.0-r1.ebuild
+++ b/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
@@ -1,14 +1,17 @@
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmbatppc/wmbatppc-1.0-r1.ebuild,v 1.2 2002/07/08 21:31:07 aliz Exp $
+# Copyright 2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/wmbatppc
-
 DESCRIPTION="wmbatppc is a small battery-monitoring dockapp. It works on G3/G4 Powerbooks and iBooks."
 SRC_URI="http://titelou.free.fr/wmbatppc/${P}.tar.gz"
 HOMEPAGE="http://titelou.free.fr/wmbatppc/"
-DEPEND="virtual/glibc x11-base/xfree sys-apps/pmud"
-RDEPEND="virtual/glibc x11-base/xfree sys-apps/pmud"
-SLOT=1
-LICENSE=GPL-2
+
+DEPEND="virtual/x11
+	sys-apps/pmud"
+
+SLOT="1"
+LICENSE="GPL-2"
 KEYWORDS="ppc"
 
 src_compile() {
diff --git a/x11-misc/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index def7129b6b21..c4056f6af945 100644
--- a/x11-misc/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmbattery
+# ChangeLog for x11-plugins/wmbattery
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmbattery/ChangeLog,v 1.2 2002/02/07 13:13:00 vitaly Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmbattery-1.2.1-r1 (7-Feb-2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org>  * :
+
+  Relocated to x11-plugins
+
   7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmbattery-1.2.1-r1.ebuild :
   
   Fixed and added to portage.
diff --git a/x11-misc/wmbattery/files/digest-wmbattery-1.2.1-r1 b/x11-plugins/wmbattery/files/digest-wmbattery-1.2.1-r1
index 64e9d36c97bc..64e9d36c97bc 100644
--- a/x11-misc/wmbattery/files/digest-wmbattery-1.2.1-r1
+++ b/x11-plugins/wmbattery/files/digest-wmbattery-1.2.1-r1
diff --git a/x11-misc/wmbattery/wmbattery-1.2.1-r1.ebuild b/x11-plugins/wmbattery/wmbattery-1.2.1-r1.ebuild
index 2ccbf43d41a5..c5cb4333415e 100644
--- a/x11-misc/wmbattery/wmbattery-1.2.1-r1.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-1.2.1-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmbattery/wmbattery-1.2.1-r1.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-1.2.1-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/wmbattery
 DESCRIPTION="A dockable app to report APM battery stats."
 SRC_URI="http://kitenet.net/programs/code/wmbattery/wmbattery.tar.gz"
 HOMEPAGE="http://kitenet.net/programs/wmbattery"
-DEPEND="x11-base/xfree virtual/glibc"
-KEYWORDS="x86 sparc sparc64"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 sparc sparc64"
 
 src_install () {
 	dobin wmbattery
diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
new file mode 100644
index 000000000000..200af3610edd
--- /dev/null
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for x11-plugins/wmbiff
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmbiff-0.3.5 (7-Feb-2002)
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmbiff-0.3.5.ebuild :
+  
+  Just added to portage.
diff --git a/x11-misc/wmbiff/files/digest-wmbiff-0.3.5 b/x11-plugins/wmbiff/files/digest-wmbiff-0.3.5
index 2d8437ecf62d..2d8437ecf62d 100644
--- a/x11-misc/wmbiff/files/digest-wmbiff-0.3.5
+++ b/x11-plugins/wmbiff/files/digest-wmbiff-0.3.5
diff --git a/x11-misc/wmbiff/wmbiff-0.3.5.ebuild b/x11-plugins/wmbiff/wmbiff-0.3.5.ebuild
index ef00232b1f0e..6a401b48d0df 100644
--- a/x11-misc/wmbiff/wmbiff-0.3.5.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.3.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmbiff/wmbiff-0.3.5.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.3.5.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}/wmbiff
-
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
-DEPEND="virtual/glibc x11-base/xfree"
-#RDEPEND=""
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmcms/ChangeLog b/x11-plugins/wmcms/ChangeLog
index 7950bc3cf665..ec1fa7b06684 100644
--- a/x11-misc/wmcms/ChangeLog
+++ b/x11-plugins/wmcms/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmcms
+# ChangeLog for x11-plugins/wmcms
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmcms/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmcms-0.3.5 (1 Feb 2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/x11-misc/wmcms/files/digest-wmcms-0.3.5 b/x11-plugins/wmcms/files/digest-wmcms-0.3.5
index 96367ea8b7c2..96367ea8b7c2 100644
--- a/x11-misc/wmcms/files/digest-wmcms-0.3.5
+++ b/x11-plugins/wmcms/files/digest-wmcms-0.3.5
diff --git a/x11-misc/wmcms/wmcms-0.3.5.ebuild b/x11-plugins/wmcms/wmcms-0.3.5.ebuild
index 8b97fe207c19..5d57f4cb251b 100644
--- a/x11-misc/wmcms/wmcms-0.3.5.ebuild
+++ b/x11-plugins/wmcms/wmcms-0.3.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmcms/wmcms-0.3.5.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/wmcms-0.3.5.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
-
-DESCRIPTION="WindowMaker CPU / Mem Usage Monitor Dock App."
+DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App."
 SRC_URI="http://orbita.starmedia.com/~neofpo/files/${P}.tar.bz2"
 HOMEPAGE="http://orbita.starmedia.com/~neofpo/wmcms.html"
+
 DEPEND=">=x11-libs/docklib-0.2"
-#RDEPEND=""
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmfishtime/ChangeLog b/x11-plugins/wmfishtime/ChangeLog
index 7c8d38405151..543f0c767af3 100644
--- a/x11-misc/wmfishtime/ChangeLog
+++ b/x11-plugins/wmfishtime/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmfishtime
+# ChangeLog for x11-plugins/wmfishtime
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmfishtime/ChangeLog,v 1.2 2002/06/07 18:34:57 blackmore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmfishtime-1.23-r2 (7 Jun 2002)
 
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   7 Jun 2002; J. Perrot <blackmore@gentoo.org> :
 
   Correction of the sed substitution in the ebuild file
diff --git a/x11-misc/wmfishtime/files/digest-wmfishtime-1.23-r1 b/x11-plugins/wmfishtime/files/digest-wmfishtime-1.23-r1
index d9653fb5c09f..d9653fb5c09f 100644
--- a/x11-misc/wmfishtime/files/digest-wmfishtime-1.23-r1
+++ b/x11-plugins/wmfishtime/files/digest-wmfishtime-1.23-r1
diff --git a/x11-misc/wmfishtime/files/digest-wmfishtime-1.23-r2 b/x11-plugins/wmfishtime/files/digest-wmfishtime-1.23-r2
index d9653fb5c09f..d9653fb5c09f 100644
--- a/x11-misc/wmfishtime/files/digest-wmfishtime-1.23-r2
+++ b/x11-plugins/wmfishtime/files/digest-wmfishtime-1.23-r2
diff --git a/x11-misc/wmfishtime/wmfishtime-1.23-r1.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild
index 2b9c5232735b..cfe950997539 100644
--- a/x11-misc/wmfishtime/wmfishtime-1.23-r1.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmfishtime/wmfishtime-1.23-r1.ebuild,v 1.7 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 # to make this work in KDE, run it with the -b option :)
+S=${WORKDIR}/${P}
 DESCRIPTION="A fun clock applet for your desktop featuring swimming fish"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
-LICENSE="GPL-2"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
-S=${WORKDIR}/${P}
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
-DEPEND="virtual/glibc =x11-libs/gtk+-1.2*"
+DEPEND="=x11-libs/gtk+-1.2*"
 
 src_compile() {
-
 	sed -e "s/CFLAGS = -O3/CFLAGS = ${CFLAGS}/" Makefile | cat > Makefile
 	make || die
 }
 
 src_install () {
-
 	into /usr
 	dobin wmfishtime
 	doman wmfishtime.1
diff --git a/x11-misc/wmfishtime/wmfishtime-1.23-r2.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
index 4432e75abb20..2b3c72f2326e 100644
--- a/x11-misc/wmfishtime/wmfishtime-1.23-r2.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmfishtime/wmfishtime-1.23-r2.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 # to make this work in KDE, run it with the -b option :)
+S=${WORKDIR}/${P}
 DESCRIPTION="A fun clock applet for your desktop featuring swimming fish"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
-LICENSE="GPL-2"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
-S=${WORKDIR}/${P}
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
-DEPEND="virtual/glibc =x11-libs/gtk+-1.2*"
+DEPEND="=x11-libs/gtk+-1.2*"
 
 src_compile() {
-
 	sed -e "s/CFLAGS = -O3/CFLAGS = ${CFLAGS}/" Makefile | cat > Makefile.tmp
 	mv Makefile.tmp Makefile
-
 	make || die
 }
 
 src_install () {
-
 	into /usr
 	dobin wmfishtime
 	doman wmfishtime.1
diff --git a/x11-plugins/wmifs/ChangeLog b/x11-plugins/wmifs/ChangeLog
new file mode 100644
index 000000000000..105416217325
--- /dev/null
+++ b/x11-plugins/wmifs/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for x11-plugins/wmapm
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmifs-1.3_beta1 (3 Feb 2002)
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  3 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org>:
+  
+  Initial ebuild revision.
diff --git a/x11-misc/wmifs/files/digest-wmifs-1.3_beta1 b/x11-plugins/wmifs/files/digest-wmifs-1.3_beta1
index a79ec0844d5d..a79ec0844d5d 100644
--- a/x11-misc/wmifs/files/digest-wmifs-1.3_beta1
+++ b/x11-plugins/wmifs/files/digest-wmifs-1.3_beta1
diff --git a/x11-misc/wmifs/wmifs-1.3_beta1.ebuild b/x11-plugins/wmifs/wmifs-1.3_beta1.ebuild
index 6fdf9e827cbb..5c213afb3d09 100644
--- a/x11-misc/wmifs/wmifs-1.3_beta1.ebuild
+++ b/x11-plugins/wmifs/wmifs-1.3_beta1.ebuild
@@ -1,15 +1,16 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmifs/wmifs-1.3_beta1.ebuild,v 1.4 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/wmifs-1.3_beta1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/wmifs.app/wmifs
-
 DESCRIPTION="Network monitoring dock.app"
 SRC_URI="http://linux.tucows.tierra.net/files/x11/dock/wmifs-1.3b1.tar.gz"
 HOMEPAGE="http://www.linux.tucows.com"
-DEPEND="virtual/glibc x11-base/xfree"
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-plugins/wmmail/ChangeLog b/x11-plugins/wmmail/ChangeLog
new file mode 100644
index 000000000000..f42c9d034821
--- /dev/null
+++ b/x11-plugins/wmmail/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for x11-plugins/wmmail
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmmail-0.64 (19-Feb-2002)
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  19 Feb 2002; Arcady Genkin <agenkin@thpoon.com> wmmail-0.64.ebuild :
+
+  Initial version of this package.
diff --git a/x11-misc/wmmail/files/digest-wmmail-0.64 b/x11-plugins/wmmail/files/digest-wmmail-0.64
index 4f910da0c617..4f910da0c617 100644
--- a/x11-misc/wmmail/files/digest-wmmail-0.64
+++ b/x11-plugins/wmmail/files/digest-wmmail-0.64
diff --git a/x11-misc/wmmail/wmmail-0.64.ebuild b/x11-plugins/wmmail/wmmail-0.64.ebuild
index a8f5ec85d436..6f507597a643 100644
--- a/x11-misc/wmmail/wmmail-0.64.ebuild
+++ b/x11-plugins/wmmail/wmmail-0.64.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmmail/wmmail-0.64.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/wmmail-0.64.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
+MY_PN=WMMail.app
+MY_P=${MY_P}-${PV}
+S=${WORKDIR}/${MY_PN}
 DESCRIPTION="Mail checking dock applet for WindowMaker (mbox, POP3, IMAP, mh, and MailDir)"
 HOMEPAGE="http://www.eecg.toronto.edu/cgi-bin/cgiwrap/chanb/index.cgi?wmmail"
-WMMAIL_NAME="WMMail.app"
-LICENSE="GPL-2"
+SRC_URI="http://www.eecg.utoronto.ca/~chanb/${MY_PN}/${MY_P}.tar.gz"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
-SRC_URI="http://www.eecg.utoronto.ca/~chanb/WMMail.app/WMMail.app-${PV}.tar.gz"
-S="${WORKDIR}/WMMail.app-${PV}"
-
-DEPEND="x11-base/xfree
+DEPEND="virtual/x11
 	x11-libs/libPropList"
 
 src_compile() {
-	./configure \
-		--host="${CHOST}" \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf || die "./configure failed"
 	emake || die
 }
 
@@ -28,7 +25,7 @@ src_install () {
 	cd "${S}"
 	make DESTDIR="${D}" install || die
 	dodir /usr/bin
-	dosym /usr/lib/GNUstep/Apps/WMMail.app/WMMail /usr/bin/wmmail
+	dosym /usr/lib/GNUstep/Apps/${MY_PN}/WMMail /usr/bin/wmmail
 	dodoc AUTHORS COPYING NEWS README doc/Help.txt
 	mv doc/wmmail.man doc/wmmail.1
 	doman doc/wmmail.1
diff --git a/x11-plugins/wmmixer-alsa/ChangeLog b/x11-plugins/wmmixer-alsa/ChangeLog
new file mode 100644
index 000000000000..22eeb58b4f52
--- /dev/null
+++ b/x11-plugins/wmmixer-alsa/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for x11-plugins/wmmixer-alsa
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer-alsa/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmmixer-alsa-0.6 (7-Feb-2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmmixer-alsa-0.6.ebuild :
+  
+  Just added to portage.
diff --git a/x11-misc/wmmixer-alsa/files/digest-wmmixer-alsa-0.6 b/x11-plugins/wmmixer-alsa/files/digest-wmmixer-alsa-0.6
index 308db8c75ae7..308db8c75ae7 100644
--- a/x11-misc/wmmixer-alsa/files/digest-wmmixer-alsa-0.6
+++ b/x11-plugins/wmmixer-alsa/files/digest-wmmixer-alsa-0.6
diff --git a/x11-misc/wmmixer-alsa/wmmixer-alsa-0.6.ebuild b/x11-plugins/wmmixer-alsa/wmmixer-alsa-0.6.ebuild
index 06ccdc871719..a39360eff28c 100644
--- a/x11-misc/wmmixer-alsa/wmmixer-alsa-0.6.ebuild
+++ b/x11-plugins/wmmixer-alsa/wmmixer-alsa-0.6.ebuild
@@ -1,16 +1,17 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmmixer-alsa/wmmixer-alsa-0.6.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer-alsa/wmmixer-alsa-0.6.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="A hacked version of wmmixer by Sam Hawker to make it use ALSA in stead of the OSS sound drivers in the linux kernel."
 SRC_URI="http://bohemians.org/~iznogood/wmmixer-alsa/${P}.tar.gz"
 HOMEPAGE="http://bohemians.org/~iznogood/"
+
 DEPEND="virtual/x11 
 	=media-libs/alsa-lib-0.5*"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmmon/ChangeLog b/x11-plugins/wmmon/ChangeLog
index a3d55d82885c..69b43fa2b417 100644
--- a/x11-misc/wmmon/ChangeLog
+++ b/x11-plugins/wmmon/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmmon
+# ChangeLog for x11-plugins/wmmon
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmmon/ChangeLog,v 1.5 2002/02/19 16:48:05 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmmon-1.0_beta2-r1 (9-Feb-2002)
 
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   9 Feb 2002; Arcady Genkin <agenkin@thpoon.com> wmmon-1.0_beta2.ebuild :
 
   Fixed to make use of $CFLAGS.
diff --git a/x11-misc/wmmon/files/digest-wmmon-1.0_beta2 b/x11-plugins/wmmon/files/digest-wmmon-1.0_beta2
index aa0d5acf08e0..aa0d5acf08e0 100644
--- a/x11-misc/wmmon/files/digest-wmmon-1.0_beta2
+++ b/x11-plugins/wmmon/files/digest-wmmon-1.0_beta2
diff --git a/x11-misc/wmmon/files/digest-wmmon-1.0_beta2-r1 b/x11-plugins/wmmon/files/digest-wmmon-1.0_beta2-r1
index aa0d5acf08e0..aa0d5acf08e0 100644
--- a/x11-misc/wmmon/files/digest-wmmon-1.0_beta2-r1
+++ b/x11-plugins/wmmon/files/digest-wmmon-1.0_beta2-r1
diff --git a/x11-misc/wmmon/wmmon-1.0_beta2-r1.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild
index 4f758823cec4..2df22f002ba6 100644
--- a/x11-misc/wmmon/wmmon-1.0_beta2-r1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmmon/wmmon-1.0_beta2-r1.ebuild,v 1.7 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 S="${WORKDIR}/wmmon.app"
 
 DESCRIPTION="Dockable system resources monitor applette for WindowMaker"
-
 WMMON_VERSION=1_0b2
 SRC_URI="http://rpig.dyndns.org/~anstinus/Linux/wmmon-${WMMON_VERSION}.tar.gz"
 HOMEPAGE="http://www.bensinclair.com/dockapp/"
-DEPEND="x11-base/xfree x11-wm/WindowMaker virtual/glibc"
-LICENSE="GPL-2"
+
+DEPEND="x11-wm/WindowMaker"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_unpack() {
diff --git a/x11-misc/wmmon/wmmon-1.0_beta2.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2.ebuild
index 14bbf7824fac..7aaa66ffcd91 100644
--- a/x11-misc/wmmon/wmmon-1.0_beta2.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmmon/wmmon-1.0_beta2.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
-S=${WORKDIR}/wmmon.app
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
+S=${WORKDIR}/wmmon.app
 DESCRIPTION="Dockable system resources monitor applette for WindowMaker"
-
 WMMON_VERSION=1_0b2
 SRC_URI="http://rpig.dyndns.org/~anstinus/Linux/wmmon-${WMMON_VERSION}.tar.gz"
 HOMEPAGE="http://www.bensinclair.com/dockapp/"
-DEPEND="x11-base/xfree x11-wm/WindowMaker virtual/glibc"
-LICENSE="GPL-2"
+
+DEPEND="x11-wm/WindowMaker"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-plugins/wmnet/ChangeLog b/x11-plugins/wmnet/ChangeLog
new file mode 100644
index 000000000000..3f5636c4acc5
--- /dev/null
+++ b/x11-plugins/wmnet/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for x11-plugins/wmnet
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmnet-1.06.ebuild (8 Jun 2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  8 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+
+  New port from eyez@infinite.fsw.leidenuniv.nl (Y-z).
diff --git a/x11-misc/wmnet/files/digest-wmnet-1.06 b/x11-plugins/wmnet/files/digest-wmnet-1.06
index 5c529e7b47d4..5c529e7b47d4 100644
--- a/x11-misc/wmnet/files/digest-wmnet-1.06
+++ b/x11-plugins/wmnet/files/digest-wmnet-1.06
diff --git a/x11-misc/wmnet/wmnet-1.06.ebuild b/x11-plugins/wmnet/wmnet-1.06.ebuild
index 1132630d44e8..cf5afb276779 100644
--- a/x11-misc/wmnet/wmnet-1.06.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmnet/wmnet-1.06.ebuild,v 1.3 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/wmnet-1.06.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="WMnet is a dock.app network monitor"
 SRC_URI="http://www.digitalkaos.net/linux/${PN}/download/${P}.tar.gz"
 HOMEPAGE="http://http://www.digitalkaos.net/linux/wmnet/"
-DEPEND="virtual/glibc x11-base/xfree"
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmnetselect/ChangeLog b/x11-plugins/wmnetselect/ChangeLog
index fc7fe5c13fe7..b318ca04a989 100644
--- a/x11-misc/wmnetselect/ChangeLog
+++ b/x11-plugins/wmnetselect/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmnetselect
+# ChangeLog for x11-plugins/wmnetselect
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmnetselect/ChangeLog,v 1.3 2002/02/10 09:24:07 vitaly Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmnetselect-0.8-r1 (9-Feb-2002)
 
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   9 Feb 2002; Arcady Genkin <agenkin@thpoon.com> wmnetselect-0.8.ebuild-r1 :
 
   Fixed to make use of CFLAGS.
diff --git a/x11-misc/wmnetselect/files/digest-wmnetselect-0.8 b/x11-plugins/wmnetselect/files/digest-wmnetselect-0.8
index 797fa37a0fe5..797fa37a0fe5 100644
--- a/x11-misc/wmnetselect/files/digest-wmnetselect-0.8
+++ b/x11-plugins/wmnetselect/files/digest-wmnetselect-0.8
diff --git a/x11-misc/wmnetselect/files/digest-wmnetselect-0.8-r1 b/x11-plugins/wmnetselect/files/digest-wmnetselect-0.8-r1
index 797fa37a0fe5..797fa37a0fe5 100644
--- a/x11-misc/wmnetselect/files/digest-wmnetselect-0.8-r1
+++ b/x11-plugins/wmnetselect/files/digest-wmnetselect-0.8-r1
diff --git a/x11-misc/wmnetselect/wmnetselect-0.8-r1.ebuild b/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
index 553b3fc27c0b..63ee17745f83 100644
--- a/x11-misc/wmnetselect/wmnetselect-0.8-r1.ebuild
+++ b/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
@@ -1,20 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="WindowMaker browser launcher doclette"
 HOMEPAGE="http://freshmeat.net/projects/wmnetselect/"
-
-# Technically, the URL is http://home.att.net/~apathos/code/${P}.tar.gz,
-# but it's dead. :^(
 SRC_URI="ftp://ftp11.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
-DEPEND="x11-base/xfree virtual/glibc"
+DEPEND="virtual/x11"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-misc/wmnetselect/wmnetselect-0.8.ebuild b/x11-plugins/wmnetselect/wmnetselect-0.8.ebuild
index 821be2a5bc96..e04a16d6ba59 100644
--- a/x11-misc/wmnetselect/wmnetselect-0.8.ebuild
+++ b/x11-plugins/wmnetselect/wmnetselect-0.8.ebuild
@@ -1,20 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmnetselect/wmnetselect-0.8.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/wmnetselect-0.8.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="WindowMaker browser launcher doclette"
 HOMEPAGE="http://freshmeat.net/projects/wmnetselect/"
-
-# Technically, the URL is http://home.att.net/~apathos/code/${P}.tar.gz,
-# but it's dead. :^(
 SRC_URI="ftp://ftp11.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tar.gz"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
-DEPEND="x11-base/xfree virtual/glibc"
+DEPEND="virtual/x11"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-plugins/wmpinboard/ChangeLog b/x11-plugins/wmpinboard/ChangeLog
new file mode 100644
index 000000000000..8f105012bed9
--- /dev/null
+++ b/x11-plugins/wmpinboard/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for x11-plugins/wmpinboard
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmpinboard-1.0 (26 May 2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  26 May 2002; J.Alberto S.L. <bass@gentoo.org> wmpinboard-1.0.ebuild:
+	First relase.
diff --git a/x11-misc/wmpinboard/files/digest-wmpinboard-1.0 b/x11-plugins/wmpinboard/files/digest-wmpinboard-1.0
index 717bdd512f2e..717bdd512f2e 100644
--- a/x11-misc/wmpinboard/files/digest-wmpinboard-1.0
+++ b/x11-plugins/wmpinboard/files/digest-wmpinboard-1.0
diff --git a/x11-misc/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index d3650b9d54ff..6ed2874d0689 100644
--- a/x11-misc/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmpinboard/wmpinboard-1.0.ebuild,v 1.4 2002/08/14 23:44:15 murphy Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $ 
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Window Maker dock applet resembling a miniature pinboard."
 SRC_URI="http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/${P}.tar.bz2"
 HOMEPAGE="http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard"
-LICENSE="GPL-2"
-DEPEND="x11-base/xfree
-		media-libs/xpm"
+
+DEPEND="virtual/x11
+	media-libs/xpm"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-plugins/wmppp/ChangeLog b/x11-plugins/wmppp/ChangeLog
new file mode 100644
index 000000000000..592f1438b44c
--- /dev/null
+++ b/x11-plugins/wmppp/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for x11-plugins/wmppp
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+
+*wmppp-1.3.0 (7-Feb-2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
+  7 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> wmppp-1.3.0.ebuild :
+  
+  Just added to portage.
diff --git a/x11-misc/wmppp/files/digest-wmppp-1.3.0 b/x11-plugins/wmppp/files/digest-wmppp-1.3.0
index 52c2e95958f6..52c2e95958f6 100644
--- a/x11-misc/wmppp/files/digest-wmppp-1.3.0
+++ b/x11-plugins/wmppp/files/digest-wmppp-1.3.0
diff --git a/x11-misc/wmppp/wmppp-1.3.0.ebuild b/x11-plugins/wmppp/wmppp-1.3.0.ebuild
index 7200f59e3f3f..ee1433afb3ca 100644
--- a/x11-misc/wmppp/wmppp-1.3.0.ebuild
+++ b/x11-plugins/wmppp/wmppp-1.3.0.ebuild
@@ -1,15 +1,16 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmppp/wmppp-1.3.0.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/wmppp-1.3.0.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/wmppp.app/wmppp
-
 DESCRIPTION="Network monitoring dock.app"
 SRC_URI="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/${P}.tar.gz"
 HOMEPAGE="http://www.linux.tucows.com"
-DEPEND="virtual/glibc x11-base/xfree"
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmsysmon/ChangeLog b/x11-plugins/wmsysmon/ChangeLog
index 9608c2fa88ed..02cae8384584 100644
--- a/x11-misc/wmsysmon/ChangeLog
+++ b/x11-plugins/wmsysmon/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmsysmon
+# ChangeLog for x11-plugins/wmsysmon
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmsysmon/ChangeLog,v 1.3 2002/06/24 16:52:41 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmsysmon-0.7.6-r1 (June 24 2002)
-  
+ 
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+ 
   24 June 2002; Mark Guertin <gerk@gentoo.org>:
 
   updated ebuild as it did not allow portage CFLAGS (defined its own) 
diff --git a/x11-misc/wmsysmon/files/digest-wmsysmon-0.7.6 b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6
index 251f0cd76a3e..251f0cd76a3e 100644
--- a/x11-misc/wmsysmon/files/digest-wmsysmon-0.7.6
+++ b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6
diff --git a/x11-misc/wmsysmon/files/digest-wmsysmon-0.7.6-r1 b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r1
index 251f0cd76a3e..251f0cd76a3e 100644
--- a/x11-misc/wmsysmon/files/digest-wmsysmon-0.7.6-r1
+++ b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r1
diff --git a/x11-misc/wmsysmon/wmsysmon-0.7.6-r1.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r1.ebuild
index 15aa8ff23fce..bc1531587036 100644
--- a/x11-misc/wmsysmon/wmsysmon-0.7.6-r1.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmsysmon/wmsysmon-0.7.6-r1.ebuild,v 1.4 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="WMaker DockUp to monitor: Memory usage, Swap usage, I/O 
diff --git a/x11-misc/wmsysmon/wmsysmon-0.7.6.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.6.ebuild
index cb43593c227e..d59e0d502e49 100644
--- a/x11-misc/wmsysmon/wmsysmon-0.7.6.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.6.ebuild
@@ -1,16 +1,16 @@
 # Copyright (c) Vitaly Kushneriuk
 # Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmsysmon/wmsysmon-0.7.6.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="WMaker DockUp to monitor: Memory usage, Swap usage, I/O throughput, system uptime, hardware interrupts, paging and swap activity."
 SRC_URI="http://www.gnugeneration.com/software/wmsysmon/src/${P}.tar.gz"
 HOMEPAGE="http://www.gnugeneration.com/software/wmsysmon/"
-DEPEND="virtual/glibc x11-base/xfree"
-#RDEPEND=""
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmweather/ChangeLog b/x11-plugins/wmweather/ChangeLog
index ffdff99fa865..20a1b4de1177 100644
--- a/x11-misc/wmweather/ChangeLog
+++ b/x11-plugins/wmweather/ChangeLog
@@ -1,9 +1,13 @@
-# ChangeLog for x11-misc/wmweather
+# ChangeLog for x11-plugins/wmweather
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmweather/ChangeLog,v 1.2 2002/04/25 17:06:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
 *wmweather-1.31-r1 (25 Apr 2002)
 
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+
+  Relocated to x11-plugins
+
   25 Apr 2002; Seemant Kulleen <seemant@gentoo.org> wmweather-1.31-r1.ebuild
   files/digest-wmweather-1.31-r1 :
 
diff --git a/x11-misc/wmweather/files/digest-wmweather-1.31 b/x11-plugins/wmweather/files/digest-wmweather-1.31
index 1972abfbd675..1972abfbd675 100644
--- a/x11-misc/wmweather/files/digest-wmweather-1.31
+++ b/x11-plugins/wmweather/files/digest-wmweather-1.31
diff --git a/x11-misc/wmweather/files/digest-wmweather-1.31-r1 b/x11-plugins/wmweather/files/digest-wmweather-1.31-r1
index 1972abfbd675..1972abfbd675 100644
--- a/x11-misc/wmweather/files/digest-wmweather-1.31-r1
+++ b/x11-plugins/wmweather/files/digest-wmweather-1.31-r1
diff --git a/x11-misc/wmweather/wmweather-1.31-r1.ebuild b/x11-plugins/wmweather/wmweather-1.31-r1.ebuild
index dbfedaa30aef..deb266bf0059 100644
--- a/x11-misc/wmweather/wmweather-1.31-r1.ebuild
+++ b/x11-plugins/wmweather/wmweather-1.31-r1.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmweather/wmweather-1.31-r1.ebuild,v 1.5 2002/08/14 23:44:15 murphy Exp $
-
-# Because of the capital "W" in the package name
-WMW_PACKAGE=wmWeather
-
-S="${WORKDIR}/${WMW_PACKAGE}-${PV}"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/wmweather-1.31-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
+MY_P=${P/wmw/wmW}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Dockable applette for WindowMaker that shows weather."
-SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${WMW_PACKAGE}-${PV}.tar.gz"
+SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${MY_P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
+
 DEPEND="x11-base/xfree
 	sys-devel/perl"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {
diff --git a/x11-misc/wmweather/wmweather-1.31.ebuild b/x11-plugins/wmweather/wmweather-1.31.ebuild
index a625c1a1e511..19ae6fda08df 100644
--- a/x11-misc/wmweather/wmweather-1.31.ebuild
+++ b/x11-plugins/wmweather/wmweather-1.31.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmweather/wmweather-1.31.ebuild,v 1.6 2002/08/14 23:44:15 murphy Exp $
-
-# Because of the capital "W" in the package name
-WMW_PACKAGE=wmWeather
-
-S="${WORKDIR}/${WMW_PACKAGE}-${PV}"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/wmweather-1.31.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
 
+MY_P=${P/wmw/wmW}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Dockable applette for WindowMaker that shows weather."
-SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${WMW_PACKAGE}-${PV}.tar.gz"
+SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${MY_P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
-DEPEND="x11-base/xfree x11-wm/WindowMaker sys-devel/perl virtual/glibc"
-LICENSE="GPL-2"
+
+DEPEND="virtual/x11
+	sys-devel/perl"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
 src_compile() {