Various epatch sed and cosmetic changes

89 files changed, 226 insertions, 299 deletions

diff --git a/x11-plugins/asapm/Manifest b/x11-plugins/asapm/Manifest
index f2241d042023..f4284205fc0e 100644
--- a/x11-plugins/asapm/Manifest
+++ b/x11-plugins/asapm/Manifest
@@ -1,6 +1,6 @@
+MD5 693c24d1bc9345415bb3439d3e57f340 asapm-2.11.ebuild 639
+MD5 500df70a8d19675a56c9888b540644d8 asapm-2.10.ebuild 763
 MD5 ff9ee836c0d663d309aa0819fb9fd668 ChangeLog 990
-MD5 ddfc2bbf91bd206f816e181cfcdf9aea asapm-2.10.ebuild 768
-MD5 3e2f8a2610714660247f4e9f6a67c313 asapm-2.11.ebuild 992
 MD5 fda28a37f9d22eaab623916850ab8559 files/asapm-2.10-gentoo.diff 625
 MD5 8421c0b48b3a26caa0993a6d56c448b0 files/digest-asapm-2.10 61
 MD5 88a7ec946c29032d3526c5481c29ca67 files/digest-asapm-2.11 61
diff --git a/x11-plugins/asapm/asapm-2.10.ebuild b/x11-plugins/asapm/asapm-2.10.ebuild
index cd51c8848ac2..b5b2ef2c81f1 100644
--- a/x11-plugins/asapm/asapm-2.10.ebuild
+++ b/x11-plugins/asapm/asapm-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.10.ebuild,v 1.4 2003/09/06 05:45:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.10.ebuild,v 1.5 2004/01/04 18:36:45 aliz Exp $
 
 S=${WORKDIR}/${P}
 
@@ -17,7 +17,7 @@ DEPEND="virtual/glibc virtual/x11"
 
 src_compile() {
 	./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 	emake || die
 }
 
diff --git a/x11-plugins/asapm/asapm-2.11.ebuild b/x11-plugins/asapm/asapm-2.11.ebuild
index a9adab5a7dbf..f8fa5455239d 100644
--- a/x11-plugins/asapm/asapm-2.11.ebuild
+++ b/x11-plugins/asapm/asapm-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.11.ebuild,v 1.5 2003/09/06 05:45:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.11.ebuild,v 1.6 2004/01/04 18:36:45 aliz Exp $
 
 IUSE="jpeg"
 
@@ -10,37 +10,17 @@ SRC_URI="http://www.tigr.net/afterstep/download/asapm/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net/afterstep/list.pl"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc  ppc"
+KEYWORDS="x86 sparc ppc"
 
 DEPEND="virtual/x11
 	jpeg? ( media-libs/jpeg )"
 
 src_compile() {
-
-	local myconf
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	./configure \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myconf} || die
-
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	econf `use_enable jpeg` || die
 	emake || die
 }
 
 src_install () {
-
-	dodir usr/bin
-	dodir usr/share/man/man1
-
-	make \
-		AFTER_BIN_DIR=${D}/usr/bin \
-		AFTER_MAN_DIR=${D}/usr/share/man/man1 \
-		install || die
+	dobin asapm
+	newman asapm.man asapm.1
 }
diff --git a/x11-plugins/asbutton/Manifest b/x11-plugins/asbutton/Manifest
index 5a76246cfaf0..7d17b95b4c21 100644
--- a/x11-plugins/asbutton/Manifest
+++ b/x11-plugins/asbutton/Manifest
@@ -1,7 +1,7 @@
+MD5 4333f90739c757e32161beb576e4fb2b asbutton-0.3.ebuild 759
+MD5 a8ccd2ba8cfae99840553f8b2d6ea04e asbutton-0.3-r1.ebuild 806
 MD5 65766d75fd4f95f82800aaabd57bea13 ChangeLog 646
-MD5 c61ac29a9fe0e38e4da93641c232d967 asbutton-0.3.ebuild 786
-MD5 87a58b81a5868063003ab9b45937cc98 asbutton-0.3-r1.ebuild 833
-MD5 fdf751b1bc524954a5ad14c19e3eeccc files/asbutton-0.3-gentoo.patch 520
-MD5 43c35a2adc1d4b41bdb9a1dd199d3666 files/digest-asbutton-0.3 64
 MD5 fdf751b1bc524954a5ad14c19e3eeccc files/asbutton-0.3-r1-gentoo.patch 520
+MD5 43c35a2adc1d4b41bdb9a1dd199d3666 files/digest-asbutton-0.3 64
+MD5 fdf751b1bc524954a5ad14c19e3eeccc files/asbutton-0.3-gentoo.patch 520
 MD5 43c35a2adc1d4b41bdb9a1dd199d3666 files/digest-asbutton-0.3-r1 64
diff --git a/x11-plugins/asbutton/asbutton-0.3-r1.ebuild b/x11-plugins/asbutton/asbutton-0.3-r1.ebuild
index 432312aa5ae8..6f191ada3b72 100644
--- a/x11-plugins/asbutton/asbutton-0.3-r1.ebuild
+++ b/x11-plugins/asbutton/asbutton-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asbutton/asbutton-0.3-r1.ebuild,v 1.3 2003/09/06 05:56:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asbutton/asbutton-0.3-r1.ebuild,v 1.4 2004/01/04 18:36:45 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A simple dockable application launcher for use in AfterStep."
@@ -14,10 +14,8 @@ KEYWORDS="~x86"
 DEPEND="x11-wm/afterstep"
 
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die "patch failed"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/asbutton/asbutton-0.3.ebuild b/x11-plugins/asbutton/asbutton-0.3.ebuild
index 5259da336056..0b3415323d76 100644
--- a/x11-plugins/asbutton/asbutton-0.3.ebuild
+++ b/x11-plugins/asbutton/asbutton-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asbutton/asbutton-0.3.ebuild,v 1.3 2003/09/06 05:56:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asbutton/asbutton-0.3.ebuild,v 1.4 2004/01/04 18:36:45 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A simple dockable application launcher for use in AfterStep."
@@ -14,10 +14,8 @@ KEYWORDS="x86"
 DEPEND="virtual/x11"
 
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die "patch failed"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/asmem/Manifest b/x11-plugins/asmem/Manifest
index 8ce834f2524f..0e9cc00912dd 100644
--- a/x11-plugins/asmem/Manifest
+++ b/x11-plugins/asmem/Manifest
@@ -1,4 +1,4 @@
+MD5 902b427088460f110f63d32912aad8a2 asmem-1.9.ebuild 665
 MD5 b68734e7c8be467d7d20dc163576e084 ChangeLog 340
-MD5 e3f0d5fe9a5731ced945389c8aa7e3a0 asmem-1.9.ebuild 670
-MD5 329806857b8a65ad34c7528cf9cd6e9d files/asmem-1.9-gentoo.patch 762
 MD5 20007072993179bdf347b7d7919af88b files/digest-asmem-1.9 60
+MD5 329806857b8a65ad34c7528cf9cd6e9d files/asmem-1.9-gentoo.patch 762
diff --git a/x11-plugins/asmem/asmem-1.9.ebuild b/x11-plugins/asmem/asmem-1.9.ebuild
index b6d1adb9b2fe..9018f71c0c82 100644
--- a/x11-plugins/asmem/asmem-1.9.ebuild
+++ b/x11-plugins/asmem/asmem-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/asmem-1.9.ebuild,v 1.2 2003/09/06 05:45:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/asmem-1.9.ebuild,v 1.3 2004/01/04 18:36:45 aliz Exp $
 
 DESCRIPTION="Memory statistics monitor utility for X Windows"
 SRC_URI="http://www.tigr.net/afterstep/download/asmem/${P}.tar.gz"
@@ -12,10 +12,8 @@ KEYWORDS="x86"
 DEPEND="virtual/x11"
 
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_install () {
diff --git a/x11-plugins/gkrellkam/ChangeLog b/x11-plugins/gkrellkam/ChangeLog
index 3fb4c408686a..8c4a1184816d 100644
--- a/x11-plugins/gkrellkam/ChangeLog
+++ b/x11-plugins/gkrellkam/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for x11-plugins/gkrellkam
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/ChangeLog,v 1.5 2003/02/12 09:35:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/ChangeLog,v 1.6 2004/01/04 18:36:45 aliz Exp $
+
+*gkrellkam-2.0.0 (08 Oct 2002)
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
index 409a0a8eb14b..beafb43e30fb 100644
--- a/x11-plugins/gkrellkam/Manifest
+++ b/x11-plugins/gkrellkam/Manifest
@@ -1,5 +1,5 @@
-MD5 4cc3a1bd159a541f6f99434b2f12408e ChangeLog 1148
-MD5 b861ae86272fc6583686c094e50bbe83 gkrellkam-0.3.4.ebuild 684
-MD5 07704024c924028f79607f5fb0cdfa85 gkrellkam-2.0.0.ebuild 699
+MD5 8702e22cbc2f57033d326d0f578cde90 gkrellkam-2.0.0.ebuild 703
+MD5 81e3371c89647ebd70eb6e9472c54fe2 ChangeLog 1180
+MD5 a16f247586f79f31a6123e6fa86eab1d gkrellkam-0.3.4.ebuild 688
 MD5 003cc4de0a739a28af21074bff0b63cd files/digest-gkrellkam-0.3.4 66
 MD5 92da7650bdbd91e8256c259310a1efb3 files/digest-gkrellkam-2.0.0 66
diff --git a/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild b/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild
index 884a5b2561ec..f0ebaadb4a86 100644
--- a/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild,v 1.9 2003/02/19 22:12:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild,v 1.10 2004/01/04 18:36:45 aliz Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${P}
 DESCRIPTION="a Image-Watcher-Plugin for Gkrellm."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellkam.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
index cb3beea37773..ca5303a00ec0 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild,v 1.4 2003/02/19 22:12:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild,v 1.5 2004/01/04 18:36:45 aliz Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${P}
 DESCRIPTION="an Image-Watcher-Plugin for GKrellM2."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellkam.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/gkrellm-bgchanger/ChangeLog b/x11-plugins/gkrellm-bgchanger/ChangeLog
index 2e174e40411e..01703ececa4f 100644
--- a/x11-plugins/gkrellm-bgchanger/ChangeLog
+++ b/x11-plugins/gkrellm-bgchanger/ChangeLog
@@ -1,7 +1,8 @@
 # ChangeLog for x11-plugins/gkrellm-bgchanger
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/ChangeLog,v 1.3 2003/12/01 17:44:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/ChangeLog,v 1.4 2004/01/04 18:36:45 aliz Exp $
 
+*gkrellm-bgchanger-0.0.8 (01 Dec 2003)
 *gkrellm-bgchanger-0.0.4-r1 (01 Dec 2003)
 
   01 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
diff --git a/x11-plugins/gkrellm-bgchanger/Manifest b/x11-plugins/gkrellm-bgchanger/Manifest
index be55b24ed3cb..6ed9db2e4726 100644
--- a/x11-plugins/gkrellm-bgchanger/Manifest
+++ b/x11-plugins/gkrellm-bgchanger/Manifest
@@ -1,5 +1,5 @@
 MD5 f2c248fda834d471099666034e2cf495 gkrellm-bgchanger-0.0.8.ebuild 799
 MD5 3005b4d5c8e221ba3c4cd70e2c0583d0 gkrellm-bgchanger-0.0.4-r1.ebuild 788
-MD5 b94cfda45166a5fe86441cd546c14b1e ChangeLog 947
+MD5 b24622cbeaf7c12720b81d462e1fe909 ChangeLog 986
 MD5 bdad4dc3616d5aabd89e322f3219ac05 files/digest-gkrellm-bgchanger-0.0.4-r1 68
 MD5 6fef03f8c3e46cbc98399f67da5e847f files/digest-gkrellm-bgchanger-0.0.8 69
diff --git a/x11-plugins/gkrellm-giFT/Manifest b/x11-plugins/gkrellm-giFT/Manifest
index 258dcb95b003..e1218599b2b7 100644
--- a/x11-plugins/gkrellm-giFT/Manifest
+++ b/x11-plugins/gkrellm-giFT/Manifest
@@ -1,3 +1,3 @@
-MD5 46af7cf874694fd14d24b77478b1629c gkrellm-giFT-0.2.1.ebuild 685
 MD5 014de462756ebf7de426d32376a4746d ChangeLog 447
+MD5 6718a62ba8ce1bcf7732bfb90a0e5c15 gkrellm-giFT-0.2.1.ebuild 691
 MD5 79bb8dedf4e3fe409a12e45341c99cc4 files/digest-gkrellm-giFT-0.2.1 70
diff --git a/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.1.ebuild b/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.1.ebuild
index 609adc130055..e95faf117c20 100644
--- a/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.1.ebuild
+++ b/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.1.ebuild,v 1.1 2003/09/06 15:43:27 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.1.ebuild,v 1.2 2004/01/04 18:36:47 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GKrellM2 plugin to monitor giFT transfers"
-SRC_URI="http://www.code-monkey.de/data/${PN}/${P}.tar.gz"
+SRC_URI="http://www.code-monkey.de/data/gkrellm-giFT/${P}.tar.gz"
 HOMEPAGE="http://www.code-monkey.de/gkrellm-gift.html"
 LICENSE="GPL-2"
 SLOT="0"
@@ -12,7 +12,7 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=app-admin/gkrellm-2.1.15
-		>=net-p2p/gift-0.11.3"
+	>=net-p2p/gift-0.11.3"
 
 src_compile() {
 	econf || die
diff --git a/x11-plugins/gkrellm-hddtemp/ChangeLog b/x11-plugins/gkrellm-hddtemp/ChangeLog
index 0fef71ed15fa..57bcda99886b 100644
--- a/x11-plugins/gkrellm-hddtemp/ChangeLog
+++ b/x11-plugins/gkrellm-hddtemp/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-plugins/gkrellm-hddtemp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/ChangeLog,v 1.7 2003/11/10 19:27:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/ChangeLog,v 1.8 2004/01/04 18:36:47 aliz Exp $
 
   10 Nov 2003; Martin Holzer <mholzer@gentoo.org>
   gkrellm-hddtemp-0.2_beta.ebuild:
@@ -18,7 +18,7 @@
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*gkrellm-hddtemp-0.2 (10 Jun 2002)
+*gkrellm-hddtemp-0.1 (10 Jun 2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
diff --git a/x11-plugins/gkrellm-hddtemp/Manifest b/x11-plugins/gkrellm-hddtemp/Manifest
index 37f0173424e5..e320b1cfd89b 100644
--- a/x11-plugins/gkrellm-hddtemp/Manifest
+++ b/x11-plugins/gkrellm-hddtemp/Manifest
@@ -1,5 +1,5 @@
-MD5 4fa4b0f57e3a51dda49c3c702b06c553 ChangeLog 1361
 MD5 db337382a1776b58f5a6d7e94648c77f gkrellm-hddtemp-0.1.ebuild 1039
 MD5 0ac46d8c4dc1fb7a0e450711f1267785 gkrellm-hddtemp-0.2_beta.ebuild 1537
+MD5 e7da67485f1d1bf8c640639abd7d07ac ChangeLog 1361
 MD5 a9f57bac01537cef132c947c68eb3977 files/digest-gkrellm-hddtemp-0.1 69
 MD5 d3cc852ee5cbc0155681cecb5e3afa65 files/digest-gkrellm-hddtemp-0.2_beta 75
diff --git a/x11-plugins/gkrellm-logwatch/ChangeLog b/x11-plugins/gkrellm-logwatch/ChangeLog
index 535f7a5751b9..7a9318eb4ea9 100644
--- a/x11-plugins/gkrellm-logwatch/ChangeLog
+++ b/x11-plugins/gkrellm-logwatch/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for x11-plugins/gkrellm-logwatch
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-logwatch/ChangeLog,v 1.6 2003/02/12 09:36:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-logwatch/ChangeLog,v 1.7 2004/01/04 18:36:47 aliz Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*glogwatch-1.0 (19 Feb 2002)
+*gkrellm-logwatch-1.0 (19 Feb 2002)
 
   11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
   Added PPC to KEYWORDS.
diff --git a/x11-plugins/gkrellm-logwatch/Manifest b/x11-plugins/gkrellm-logwatch/Manifest
index bd922b0a8af7..1eaec9c16cc1 100644
--- a/x11-plugins/gkrellm-logwatch/Manifest
+++ b/x11-plugins/gkrellm-logwatch/Manifest
@@ -1,3 +1,3 @@
-MD5 dd9af81af07fd536942a7c5b2337c93e ChangeLog 666
 MD5 498ee5833213af182800edffbcc91acc gkrellm-logwatch-1.0.ebuild 680
+MD5 a268fdcc1f16f212298899c5dc40dddf ChangeLog 673
 MD5 c3b71e04d1ee9a8914cbf5334c62e15c files/digest-gkrellm-logwatch-1.0 63
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index 2683d7cee264..7ba64afb1021 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -1,4 +1,4 @@
+MD5 b4b20887d14e6a11255b60035ea916c6 gkrellmss-2.3.ebuild 895
 MD5 98f8ea424902a23c21f83a2010c5216f ChangeLog 631
-MD5 8bfca59270b4b826c39720c0912a2e13 gkrellmss-2.3.ebuild 891
-MD5 09497dcbb9e774c8877917883664d32f files/digest-gkrellmss-2.3 64
 MD5 cb282a2d5fa1b98ccf24d938b8e6f5b5 files/gkrellmss-patch-2.3.diff 638
+MD5 09497dcbb9e774c8877917883664d32f files/digest-gkrellmss-2.3 64
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
index bfbd7759417f..416ceae3a1b1 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild,v 1.5 2003/09/06 05:56:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild,v 1.6 2004/01/04 18:36:47 aliz Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ IUSE="nls"
 S=${WORKDIR}/${P}
 DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
 HOMEPAGE="http://gkrellm.net/gkrellmss/gkrellmss.html"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.gz"
+SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
 
 DEPEND="=app-admin/gkrellm-2*
 	dev-libs/fftw
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index b79ccd89e314..64dcc82cfc07 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -1,5 +1,5 @@
+MD5 529cee4584cf67218ad14a3123e371d3 gkrellshoot-0.4.1.ebuild 683
 MD5 72721bdd18c6735e113dedda771a748f ChangeLog 1323
 MD5 157e12aeee0abf6de8f1376e1c3fd344 gkrellshoot-0.3.2.ebuild 792
-MD5 7131f585d3d559e0ff142ba1441f941c gkrellshoot-0.4.1.ebuild 677
 MD5 1b94315da93e6a9ea08d07f726fccc58 files/digest-gkrellshoot-0.3.2 68
 MD5 2ddc84839a8d815f0163cd6cf58992f4 files/digest-gkrellshoot-0.4.1 68
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild
index 986eceb092b4..d9a4e1d56783 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild,v 1.6 2003/09/06 05:56:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild,v 1.7 2004/01/04 18:36:47 aliz Exp $
 
 S=${WORKDIR}/${P/s/S}
 DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
 HOMEPAGE="http://gkrellshoot.sourceforge.net/"
 
 DEPEND=">=app-admin/gkrellm-2*"
diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
index fae2f2725592..583f06c23846 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -1,5 +1,5 @@
+MD5 952a726cdd892d10d15f38c077fd6809 gkrellstock-0.4.ebuild 721
+MD5 c580636c237c0772d142b0a132d75bbd gkrellstock-0.5.ebuild 725
 MD5 ffebc0790f32b7ea10876f0d8b9b3b11 ChangeLog 786
-MD5 c39f77453f2ef29021cf627317a6ff1f gkrellstock-0.4.ebuild 715
-MD5 2d42441885fadd4a0858bea8662f221e gkrellstock-0.5.ebuild 719
 MD5 39486a7dd45163fa00f17106b8588ecf files/digest-gkrellstock-0.4 66
 MD5 21a515056c296f8cc9cdba966f4d8550 files/digest-gkrellstock-0.5 66
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild
index a97b94dadcf9..c1227e35daf3 100644
--- a/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild
+++ b/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild,v 1.5 2003/09/06 05:56:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild,v 1.6 2004/01/04 18:36:47 aliz Exp $
 
 S=${WORKDIR}/${P/s/S}
 DESCRIPTION="Get Stock quotes plugin for GKrellM"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz"
 HOMEPAGE="http://gkrellstock.sourceforge.net/"
 
 DEPEND="=app-admin/gkrellm-1*
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild
index 47322ba4c28c..a97ffac7e731 100644
--- a/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild,v 1.5 2003/09/06 05:56:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild,v 1.6 2004/01/04 18:36:47 aliz Exp $
 
 S=${WORKDIR}/${P/s/S}
 DESCRIPTION="Get Stock quotes plugin for Gkrellm2"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz"
 HOMEPAGE="http://gkrellstock.sourceforge.net/"
 
 DEPEND=">=app-admin/gkrellm-2*
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index 1f7ea155c088..0160744a4bfb 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,4 +1,4 @@
-MD5 0cf978551a30543f70922c80e416696c gkrellweather-0.2.7-r2.ebuild 1021
+MD5 bf4855bd55bd992c92529b18043f6aa6 gkrellweather-0.2.7-r2.ebuild 1016
 MD5 89ec1204fed1db7ea2f244bedf643eff gkrellweather-2.0.5.ebuild 1016
 MD5 8c9960d2ca302771f5ef45151836da95 ChangeLog 2793
 MD5 1d5471ae04d07a5b20b2bdb27fb29e5d gkrellweather-2.0.6.ebuild 1012
diff --git a/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild
index 679bee6e6444..ffaaff969c9c 100644
--- a/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild,v 1.10 2003/09/03 16:43:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild,v 1.11 2004/01/04 18:36:48 aliz Exp $
 
 S=${WORKDIR}/${P}
 DEBPATCH=${PN}_${PV}-1.diff.gz
 DESCRIPTION="GKrellM Plugin that monitors a METAR station and displays weather
 info"
 SRC_URI="http://www.cse.unsw.edu.au/~flam/repository/c/gkrellm/${P}.tar.gz
-	http://ftp.debian.org/debian/pool/main/g/${PN}/${DEBPATCH}"
+	mirror://debian/pool/main/g/gkrellweather/${DEBPATCH}"
 HOMEPAGE="http://www.cse.unsw.edu.au/~flam/programs/gkrellweather.html"
 
 SLOT="0"
diff --git a/x11-plugins/karamba-bluebar_kroller/ChangeLog b/x11-plugins/karamba-bluebar_kroller/ChangeLog
index e705f763fd59..f2c4eb613322 100644
--- a/x11-plugins/karamba-bluebar_kroller/ChangeLog
+++ b/x11-plugins/karamba-bluebar_kroller/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for x11-plugins/karamba-bluebar_kroller
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bluebar_kroller/ChangeLog,v 1.2 2003/06/20 04:21:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bluebar_kroller/ChangeLog,v 1.3 2004/01/04 18:36:48 aliz Exp $
 
-*karamba-bluebar-kroller-0.84 (03 May 2003)
+*karamba-bluebar_kroller-0.84 (03 May 2003)
 
   03 May 2003; Preston A. Elder <prez@gentoo.org> karamba-bluebar-kroller-0.84.ebuild:
   Initial import.
diff --git a/x11-plugins/karamba-bluebar_kroller/Manifest b/x11-plugins/karamba-bluebar_kroller/Manifest
index 2d19c2dcec7a..6234898dbd03 100644
--- a/x11-plugins/karamba-bluebar_kroller/Manifest
+++ b/x11-plugins/karamba-bluebar_kroller/Manifest
@@ -1,3 +1,3 @@
-MD5 6ec09dfc8ba2775cc1759219f432d229 files/digest-karamba-bluebar_kroller-0.84 74
 MD5 e731372bc1216ff99f163bcd67761c41 karamba-bluebar_kroller-0.84.ebuild 1401
-MD5 d221828cd5561044f86c37199f61c762 ChangeLog 403
+MD5 c7560f653d73a58d5796c1d5eb659efa ChangeLog 403
+MD5 6ec09dfc8ba2775cc1759219f432d229 files/digest-karamba-bluebar_kroller-0.84 74
diff --git a/x11-plugins/wmDownload/Manifest b/x11-plugins/wmDownload/Manifest
index 3d5dccb99007..5aff4cd12d0b 100644
--- a/x11-plugins/wmDownload/Manifest
+++ b/x11-plugins/wmDownload/Manifest
@@ -1,4 +1,4 @@
+MD5 b04271807f8a7f4617bb3e2b7d8ddbda wmDownload-0.1.2a.ebuild 747
 MD5 0927ad6b7af291613956cb5160fdaac4 ChangeLog 421
 MD5 fb2a585e2b049ef6947cae0446e72ca6 metadata.xml 358
-MD5 6a97d8a6338eda68baa0b483a51a5780 wmDownload-0.1.2a.ebuild 761
 MD5 926d9418442030e75ec55d282eb43565 files/digest-wmDownload-0.1.2a 68
diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild b/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild
index 28cc99d93498..6d28f45b444b 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.
 # 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.6 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild,v 1.7 2004/01/04 18:36:48 aliz Exp $
 
 S=${WORKDIR}/wmDownload
 
@@ -14,21 +14,17 @@ KEYWORDS="x86 amd64"
 
 DEPEND="virtual/glibc x11-base/xfree x11-libs/docklib"
 
-src_compile() {
-
-	cd ${S}
-
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:$CFLAGS:" Makefile.orig > Makefile
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	sed -i -e "s:-O2:$CFLAGS:" Makefile
+}
 
+src_compile() {
 	emake || die
-
 }
 
 src_install () {
-
 	strip wmDownload
 	dodir /usr/bin/
 	dobin wmDownload
-
 }
diff --git a/x11-plugins/wmMoonClock/Manifest b/x11-plugins/wmMoonClock/Manifest
index f5aed0e387e5..37559dbbc3c0 100644
--- a/x11-plugins/wmMoonClock/Manifest
+++ b/x11-plugins/wmMoonClock/Manifest
@@ -1,4 +1,4 @@
+MD5 b8022476622db65f34cd842402274eca wmMoonClock-1.27.ebuild 752
 MD5 e76410408d08991fa2d2c6cc400ea083 ChangeLog 396
 MD5 3cd7a2046b4387618be4a9962cbb867d metadata.xml 622
-MD5 3d31e8bdeea587a860dd6d7f17a5bd8a wmMoonClock-1.27.ebuild 797
 MD5 7ca0d493291ab50558642db09f223acc files/digest-wmMoonClock-1.27 68
diff --git a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
index 6b8a6181ee24..92af6f03f5ee 100644
--- a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
+++ b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy."
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
@@ -14,25 +14,17 @@ SLOT="0"
 KEYWORDS="x86 amd64"
 
 src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}/Src
-	mv Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	unpack ${A} ; cd ${S}/Src
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
 }
 
 src_compile() {
-
 	emake -C Src || die "parallel make failed"
-
 }
 
 src_install () {
-
 	dobin Src/wmMoonClock
 	doman Src/wmMoonClock.1
 	dodoc BUGS
-
 }
 
diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
index fcaf786652b8..6867376407ee 100644
--- a/x11-plugins/wmSMPmon/Manifest
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -1,4 +1,4 @@
+MD5 7ae5693d2f19f764a00303d7fcb14991 wmSMPmon-2.2.ebuild 679
 MD5 279a330391a46fda9ae619fb6f43808a ChangeLog 385
 MD5 9d66ac36b8fc0ff0a76f72890effea8d metadata.xml 295
-MD5 45eb8c05201514a6c2f167382910e246 wmSMPmon-2.2.ebuild 684
 MD5 cd1099f46344e8ef35a2c36db93ae7b3 files/digest-wmSMPmon-2.2 63
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-2.2.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-2.2.ebuild
index 673ae519e684..5fb8d021ba85 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-2.2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-2.2.ebuild,v 1.4 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-2.2.ebuild,v 1.5 2004/01/04 18:36:48 aliz Exp $
 
 S="${WORKDIR}/${PN}-2.x"
 
@@ -15,15 +15,16 @@ KEYWORDS="x86 amd64"
 DEPEND="virtual/glibc
 	virtual/x11"
 
-src_compile() {
-
-	cd ${S}/${PN}
-	cp Makefile Makefile.orig
-	sed -e "s:-Wall -O3 -m486:${CFLAGS}:" Makefile.orig > Makefile
-	make || die "make failed"
+src_unpack() {
+	unpack ${A} ; cd ${S}/wmSMPmon
 
+	sed -i -e "s:-Wall -O3 -m486:${CFLAGS}:" Makefile
 }
 
+src_compile() {
+	make || die "make failed"
+	}
+
 src_install() {
 
 	cd ${S}/${PN}
diff --git a/x11-plugins/wmbatppc/ChangeLog b/x11-plugins/wmbatppc/ChangeLog
index 6313a5f60870..01dabbc62b99 100644
--- a/x11-plugins/wmbatppc/ChangeLog
+++ b/x11-plugins/wmbatppc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbatppc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.2 2003/02/12 09:39:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.3 2004/01/04 18:36:48 aliz Exp $
+
+  04 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> wmbatppc-1.0-r1.ebuild:
+  This seems to be ppc only, not for amd64
 
 *wmbatppc-1.0-r1 (04 Jun 2002)
 
diff --git a/x11-plugins/wmbatppc/Manifest b/x11-plugins/wmbatppc/Manifest
index 0e98b5878a47..02e448761f8a 100644
--- a/x11-plugins/wmbatppc/Manifest
+++ b/x11-plugins/wmbatppc/Manifest
@@ -1,3 +1,3 @@
-MD5 6c636b00534aefd6d94e3e9f43c1f3a8 wmbatppc-1.0-r1.ebuild 647
-MD5 d24ebdbe40c8573704ee02abb5280ec7 ChangeLog 531
+MD5 2f5b2917e71143406fb0b6eb71948a23 wmbatppc-1.0-r1.ebuild 648
+MD5 7f11cf92fb43ed798c16fb72f85cf18a ChangeLog 647
 MD5 1c36fba32a1054874bc4086e7445478e files/digest-wmbatppc-1.0-r1 63
diff --git a/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild b/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
index dc16f41bbba9..f94f8871984e 100644
--- a/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
+++ b/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-1.0-r1.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 S=${WORKDIR}/wmbatppc
 DESCRIPTION="wmbatppc is a small battery-monitoring dockapp. It works on G3/G4 Powerbooks and iBooks."
@@ -12,7 +12,7 @@ DEPEND="virtual/x11
 
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="ppc amd64"
+KEYWORDS="ppc -amd64"
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/wmbio/ChangeLog b/x11-plugins/wmbio/ChangeLog
index 3f31001c087d..3c736cd16659 100644
--- a/x11-plugins/wmbio/ChangeLog
+++ b/x11-plugins/wmbio/ChangeLog
@@ -1,10 +1,11 @@
 # ChangeLog for x11-plugins/wmbio
 # Copyright 2001-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.2 2004/01/04 02:58:09 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.3 2004/01/04 18:36:48 aliz Exp $
 
   04 Jan 2004; Markus Nigbur <pyrania@gentoo.org> wmbio-1.01.ebuild:
   ebuild fixes
 
+*wmbio-1.01 (02 Nov 2003)
 *wmbio-1.0 (02 Nov 2003)
 
   02 Nov 2003; Markus Nigbur <pyrania@gentoo.org> wmbio-1.0.ebuild,
diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest
index bd7f042f5af4..af10c4dceed2 100644
--- a/x11-plugins/wmbio/Manifest
+++ b/x11-plugins/wmbio/Manifest
@@ -1,4 +1,4 @@
 MD5 c93378ec08ddacfa3585d92abd440f83 wmbio-1.01.ebuild 656
-MD5 5c67df100ea0077b39065b96eae1255e ChangeLog 436
+MD5 bd4fc96cc2d4aef79b0eeb1a9f33ed92 ChangeLog 462
 MD5 4c5c351347637833b44c37c9c107a6b4 metadata.xml 439
 MD5 c2544808b27c1597b05b975e7cb6ea96 files/digest-wmbio-1.01 61
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index 20bec95ac280..b0a2f3e6fe2b 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -1,6 +1,6 @@
+MD5 42c57190c5dc2e9efade746f6dc90d34 wmcalc-0.3.ebuild 837
 MD5 3f2fc30978fc9a164aebcef3e14c0ec6 ChangeLog 531
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 7f62f55b4e1342d63372a05beeaf954e wmcalc-0.3.ebuild 868
 MD5 a8abd06be816518c8cd173878dbf5475 files/digest-wmcalc-0.3 66
-MD5 8a4c1371e94fdb2e66d601f877435b66 files/wmcalc-0.3-gentoo.diff 4256
 MD5 cb4a94f1ebb3397806349e863d673280 files/wmcalc.man 4751
+MD5 8a4c1371e94fdb2e66d601f877435b66 files/wmcalc-0.3-gentoo.diff 4256
diff --git a/x11-plugins/wmcalc/wmcalc-0.3.ebuild b/x11-plugins/wmcalc/wmcalc-0.3.ebuild
index ba61f898eede..768d385f6596 100644
--- a/x11-plugins/wmcalc/wmcalc-0.3.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 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.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.3.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 DESCRIPTION="A WindowMaker DockApp calculator"
 #The homepage is not working, but it is what the source lists
 HOMEPAGE="http://members.access1.net/ehflora/"
-SRC_URI="http://ftp.debian.org/debian/pool/main/w/wmcalc/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/w/wmcalc/${PN}_${PV}.orig.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
@@ -16,21 +16,15 @@ S=${WORKDIR}/${P}.orig
 IUSE=""
 
 src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
-
+	unpack ${A} ; cd ${S}
+	epatch${FILESDIR}/${P}-gentoo.diff
 }
 
 src_compile() {
-
 	emake || die
-
 }
 
 src_install () {
-
 	dobin wmcalc
 
 	dodoc README COPYING
@@ -42,5 +36,4 @@ src_install () {
 
 	insinto /etc/skel
 	newins .wmcalc
-
 }
diff --git a/x11-plugins/wmcliphist/ChangeLog b/x11-plugins/wmcliphist/ChangeLog
index a89fa2223a20..1c02fc9400ba 100644
--- a/x11-plugins/wmcliphist/ChangeLog
+++ b/x11-plugins/wmcliphist/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for x11-plugins/wmcliphist
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/ChangeLog,v 1.1 2003/06/05 11:00:24 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/ChangeLog,v 1.2 2004/01/04 18:36:48 aliz Exp $
+
+*wmcliphist-0.5 (26 Jun 2003)
 
 *wmcliphist-0.3 (5 June 2003)
 
diff --git a/x11-plugins/wmcliphist/Manifest b/x11-plugins/wmcliphist/Manifest
index 2a9133332522..be7481383123 100644
--- a/x11-plugins/wmcliphist/Manifest
+++ b/x11-plugins/wmcliphist/Manifest
@@ -1,6 +1,6 @@
-MD5 cf4541dfd3fc9c5f13957af0098494a0 ChangeLog 358
-MD5 f2cbce9d14d9c423f188ceb31843a4e0 metadata.xml 460
-MD5 ba5096ce8a7fbeb7861e5032fa37971f wmcliphist-0.3.ebuild 614
 MD5 3233c836c825b620caeb435725cda17d wmcliphist-0.5.ebuild 622
+MD5 ba5096ce8a7fbeb7861e5032fa37971f wmcliphist-0.3.ebuild 614
+MD5 ad6abcd215d31c702f67772d11c81ce8 ChangeLog 389
+MD5 f2cbce9d14d9c423f188ceb31843a4e0 metadata.xml 460
 MD5 c9cd56c59caa2c634d3235c132cbf22c files/digest-wmcliphist-0.3 65
 MD5 1d625b26af8f38aca33fbc9c0da0c0f8 files/digest-wmcliphist-0.5 65
diff --git a/x11-plugins/wmcube/ChangeLog b/x11-plugins/wmcube/ChangeLog
index 7e972d70982c..6cce14667548 100644
--- a/x11-plugins/wmcube/ChangeLog
+++ b/x11-plugins/wmcube/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for x11-plugins/wmcube-0.98
+# ChangeLog for x11-plugins/wmcube
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/ChangeLog,v 1.3 2003/02/12 09:40:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/ChangeLog,v 1.4 2004/01/04 18:36:48 aliz Exp $
 
 wmcube-0.98 (24 Oct 2002)
 
diff --git a/x11-plugins/wmcube/Manifest b/x11-plugins/wmcube/Manifest
index d4f738a2cabd..2dd069f79989 100644
--- a/x11-plugins/wmcube/Manifest
+++ b/x11-plugins/wmcube/Manifest
@@ -1,4 +1,4 @@
-MD5 2f11ce7f63c7ec7caee54ce2ae192d4b ChangeLog 560
-MD5 bdbaa3e675d7bb6539f9336a116d4277 metadata.xml 333
 MD5 d07579fb2fd80644959b18632f3f7ca2 wmcube-0.98.ebuild 724
+MD5 c01f1ef9fb2611cc7d691f1d87040383 ChangeLog 555
+MD5 bdbaa3e675d7bb6539f9336a116d4277 metadata.xml 333
 MD5 8342d498dd6e6c16135385f642627896 files/digest-wmcube-0.98 62
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index 155fc3de58bb..8068a821e85e 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -1,6 +1,6 @@
+MD5 5dfb5c89b8804cd7953b4144ea586423 wmfishtime-1.23-r2.ebuild 858
+MD5 373290d8ad7eb8cb7b5e98c0d9163177 wmfishtime-1.23-r1.ebuild 858
 MD5 316045f802253c16a470cede5b104d01 ChangeLog 999
 MD5 aeefe0a88d62157055bc87ee91bd2eb9 metadata.xml 396
-MD5 7615a01ef9d8df18f409e9fe73fd0194 wmfishtime-1.23-r1.ebuild 831
-MD5 3a840a89a2ae0791db31a7e4f03fb323 wmfishtime-1.23-r2.ebuild 861
 MD5 48b96d80c8c76d6ba48ba94defe174f2 files/digest-wmfishtime-1.23-r1 66
 MD5 48b96d80c8c76d6ba48ba94defe174f2 files/digest-wmfishtime-1.23-r2 66
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild
index f63cedd3b33b..996004e9ec4e 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild,v 1.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.23-r1.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 # to make this work in KDE, run it with the -b option :)
 S=${WORKDIR}/${P}
@@ -14,8 +14,12 @@ KEYWORDS="x86 sparc amd64"
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	sed -i -e "s/CFLAGS = -O3/CFLAGS = ${CFLAGS}/" Makefile
+}
+
 src_compile() {
-	sed -e "s/CFLAGS = -O3/CFLAGS = ${CFLAGS}/" Makefile | cat > Makefile
 	make || die
 }
 
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
index a929794f21f0..897c3b8c4931 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 # to make this work in KDE, run it with the -b option :)
 S=${WORKDIR}/${P}
@@ -14,9 +14,12 @@ KEYWORDS="x86 sparc amd64"
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	sed -i -e "s/CFLAGS = -O3/CFLAGS = ${CFLAGS}/" Makefile
+}
+
 src_compile() {
-	sed -e "s/CFLAGS = -O3/CFLAGS = ${CFLAGS}/" Makefile | cat > Makefile.tmp
-	mv Makefile.tmp Makefile
 	make || die
 }
 
diff --git a/x11-plugins/wmget/Manifest b/x11-plugins/wmget/Manifest
index c46f1f9cb7c6..804effe37787 100644
--- a/x11-plugins/wmget/Manifest
+++ b/x11-plugins/wmget/Manifest
@@ -1,7 +1,7 @@
+MD5 b6575fbe5981d410e0a5f61f3efd6bbe wmget-0.5.0.ebuild 706
+MD5 0a4058c1d1dddd980d3f533d4459f197 wmget-0.4.4.ebuild 709
 MD5 3edcfa4edcc6fda60753911ea4fb46fd ChangeLog 495
 MD5 e596892597ff96f2b78ca9a1319915db metadata.xml 436
-MD5 fadc074032142bbd33b917e62b2fae2c wmget-0.4.4.ebuild 737
-MD5 8fc56630e91db645e054613185836e5d wmget-0.5.0.ebuild 732
 MD5 b61bb40d756eaf34aceb685f2bec5e82 files/digest-wmget-0.4.4 66
 MD5 7839b46d53fe997ab15799a7250a5a0f files/digest-wmget-0.5.0 66
 MD5 4ad748dd7bcc0235ebce79719f2751e5 files/makefile.diff 956
diff --git a/x11-plugins/wmget/wmget-0.4.4.ebuild b/x11-plugins/wmget/wmget-0.4.4.ebuild
index bdb41a51c331..802b4e783eb5 100644
--- a/x11-plugins/wmget/wmget-0.4.4.ebuild
+++ b/x11-plugins/wmget/wmget-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.4.4.ebuild,v 1.4 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.4.4.ebuild,v 1.5 2004/01/04 18:36:48 aliz Exp $
 
 S="${WORKDIR}/wmget"
 
@@ -16,11 +16,8 @@ DEPEND="virtual/x11
 	>=net-ftp/curl-7.9.7"
 
 src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/makefile.diff || die "patch failed"
-
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/makefile.diff
 }
 
 src_compile() {
diff --git a/x11-plugins/wmget/wmget-0.5.0.ebuild b/x11-plugins/wmget/wmget-0.5.0.ebuild
index 06a64ca54921..569be6c9c107 100644
--- a/x11-plugins/wmget/wmget-0.5.0.ebuild
+++ b/x11-plugins/wmget/wmget-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.5.0.ebuild,v 1.2 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.5.0.ebuild,v 1.3 2004/01/04 18:36:48 aliz Exp $
 
 S="${WORKDIR}/${PN}"
 
@@ -16,9 +16,8 @@ DEPEND="virtual/x11
 	>=net-ftp/curl-7.9.7"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/makefile.diff || die "patch failed"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/makefile.diff
 }
 
 src_compile() {
diff --git a/x11-plugins/wmgtemp/Manifest b/x11-plugins/wmgtemp/Manifest
index bea91fb65cf0..06e9fc4623ae 100644
--- a/x11-plugins/wmgtemp/Manifest
+++ b/x11-plugins/wmgtemp/Manifest
@@ -1,6 +1,6 @@
+MD5 1741651a65da025990ecdc378241d48a wmgtemp-0.7.ebuild 702
+MD5 60433323d98e34c0c2870f92469a0312 wmgtemp-0.6.ebuild 727
 MD5 354f21324230c11cc1b71a1b77a53d7e ChangeLog 613
 MD5 f128e870010a5e7ca189002d71e046f6 metadata.xml 655
-MD5 2b8f0542470d60742fe6d814d532e578 wmgtemp-0.6.ebuild 771
-MD5 ea177bb02562de973e1fdda0c7db2ff9 wmgtemp-0.7.ebuild 744
 MD5 ee8e4d7233039755c7fe5e37f7ccc23d files/digest-wmgtemp-0.6 62
 MD5 ae0041a298d82b1a05a9a0c4c84e8555 files/digest-wmgtemp-0.7 62
diff --git a/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild b/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild
index 3f95191864b5..1473dcde44b6 100644
--- a/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild
+++ b/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild,v 1.6 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild,v 1.7 2004/01/04 18:36:48 aliz Exp $
 
 IUSE=""
 
@@ -16,16 +16,13 @@ KEYWORDS="x86 -ppc -sparc amd64"
 
 DEPEND="sys-apps/lm-sensors"
 
-src_compile() {
-
-	# Set compile optimizations
-	cd ${S}/src
-	cp Makefile Makefile.orig
-	sed -e "s:-Wall -g:\$(CFLAGS):" \
-		Makefile.orig > Makefile
+src_unpack() {
+	unpack ${A} ; cd ${S}/src
+	sed -i -e "s:-Wall -g:\$(CFLAGS):" Makefile
+}
 
+src_compile() {
 	emake || die "parallel make failed"
-
 }
 
 src_install() {
diff --git a/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild b/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild
index 16bd87d9bbc3..f90113fb6d96 100644
--- a/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild
+++ b/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild,v 1.1 2003/11/16 22:50:49 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild,v 1.2 2004/01/04 18:36:48 aliz Exp $
 
 IUSE=""
 
@@ -14,13 +14,12 @@ KEYWORDS="x86 -ppc -sparc amd64"
 
 DEPEND="sys-apps/lm-sensors"
 
-src_compile() {
-	# Set compile optimizations
-	cd ${S}/src
-	cp Makefile Makefile.orig
-	sed -e "s:-Wall -g:\$(CFLAGS):" \
-		Makefile.orig > Makefile
+src_unpack() {
+	unpack ${A} ; cd ${S}/src
+	sed -i -e "s:-Wall -g:\$(CFLAGS):" Makefile
+}
 
+src_compile() {
 	emake || die "parallel make failed"
 }
 
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
index 03eceb55de34..2b0be9c07fd6 100644
--- a/x11-plugins/wminet/Manifest
+++ b/x11-plugins/wminet/Manifest
@@ -1,4 +1,4 @@
+MD5 9f32a90985ede83d6b78c6b98e7d6b33 wminet-2.0.3.ebuild 837
 MD5 ee74d66a5dee6b6f932873dcf02a21d8 ChangeLog 493
 MD5 26032e82a4c490db4a66fe6d1936e1dd metadata.xml 371
-MD5 39f7bf99ee46c56a9b313c5732931f12 wminet-2.0.3.ebuild 882
 MD5 de78aee247c7915625d25e5df489c343 files/digest-wminet-2.0.3 63
diff --git a/x11-plugins/wminet/wminet-2.0.3.ebuild b/x11-plugins/wminet/wminet-2.0.3.ebuild
index f0d54fb4e4e3..124fafc1f8f7 100644
--- a/x11-plugins/wminet/wminet-2.0.3.ebuild
+++ b/x11-plugins/wminet/wminet-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/wminet-2.0.3.ebuild,v 1.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/wminet-2.0.3.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 S="${WORKDIR}/${PN}.app"
 
@@ -15,24 +15,17 @@ KEYWORDS="x86 ~sparc amd64"
 DEPEND="virtual/x11"
 
 src_unpack() {
-
-	unpack ${A}
-	cd ${S}/wminet
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:$CFLAGS:" Makefile.orig > Makefile
-
+	unpack ${A} ; cd ${S}/wminet
+	sed -i -e "s:-O2:$CFLAGS:" Makefile
 }
 
 src_compile() {
-
 	cd ${S}/wminet
 
 	emake || die "parallel make failed"
-
 }
 
 src_install() {
-
 	cd ${S}/wminet
 
 	dobin wminet
@@ -44,5 +37,4 @@ src_install() {
 	insinto /etc/skel
 	insopts -m 600
 	newins wminetrc .wminetrc
-
 }
diff --git a/x11-plugins/wmitime/Manifest b/x11-plugins/wmitime/Manifest
index ae84621b3d62..2e3a812fe84b 100644
--- a/x11-plugins/wmitime/Manifest
+++ b/x11-plugins/wmitime/Manifest
@@ -1,5 +1,5 @@
+MD5 7997c00aad5fb30f7dace82822288667 wmitime-0.3.ebuild 756
 MD5 edb1d4c19299934eaa47e5579c552066 ChangeLog 400
 MD5 1a356f312f3f083697591fede9565f3a metadata.xml 362
-MD5 46d2accbb22a131d02567744e015a1a3 wmitime-0.3.ebuild 788
 MD5 ed57078efdae8e33c0afccb712986490 files/digest-wmitime-0.3 62
 MD5 9b98c7ac42b6ab69fc38a9a1c8114253 files/makefile.diff 729
diff --git a/x11-plugins/wmitime/wmitime-0.3.ebuild b/x11-plugins/wmitime/wmitime-0.3.ebuild
index ee1607d71f27..e43cdb226846 100644
--- a/x11-plugins/wmitime/wmitime-0.3.ebuild
+++ b/x11-plugins/wmitime/wmitime-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/wmitime-0.3.ebuild,v 1.4 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/wmitime-0.3.ebuild,v 1.5 2004/01/04 18:36:48 aliz Exp $
 
 S="${WORKDIR}/${PN}"
 
@@ -16,26 +16,19 @@ DEPEND="virtual/glibc
 	virtual/x11"
 
 src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/makefile.diff || die "patch failed"
-
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/makefile.diff
 }
 
 src_compile() {
-
 	cd ${S}/wmitime
 	make || die "make failed"
-
 }
 
 src_install() {
-
 	cd ${S}/wmitime
 	dobin wmitime
 
 	cd ${S}
 	dodoc BUGS CHANGES COPYING README
-
 }
diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index dcf823441ab3..97f965878de0 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -1,6 +1,6 @@
+MD5 46d0af62889ab33c22a2aa811e010d99 wmmon-1.0_beta2-r1.ebuild 776
 MD5 3637b310f703c3b463196e3a79dae882 ChangeLog 1126
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 5cdbf31c27aa504611a643a147616faa wmmon-1.0_beta2-r1.ebuild 819
 MD5 ceedfcdbed48377818f314c4d69547df wmmon-1.0_beta2.ebuild 693
 MD5 98b814408937f2d47b59cfedac2640e1 files/digest-wmmon-1.0_beta2 62
 MD5 98b814408937f2d47b59cfedac2640e1 files/digest-wmmon-1.0_beta2-r1 62
diff --git a/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild
index 604030e3d4c7..d72cd545c528 100644
--- a/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild,v 1.8 2003/12/06 16:00:06 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r1.ebuild,v 1.9 2004/01/04 18:36:48 aliz Exp $
 S="${WORKDIR}/wmmon.app"
 
 DESCRIPTION="Dockable system resources monitor applette for WindowMaker"
@@ -15,10 +15,8 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64"
 
 src_unpack() {
-	unpack "${A}"
-	cd "${S}/wmmon"
-	mv Makefile Makefile.orig
-	sed -e "s|-O2|${CFLAGS}|" Makefile.orig > Makefile
+	unpack ${A} ; cd ${S}/wmmon
+	sed -i -e "s|-O2|${CFLAGS}|" Makefile
 }
 
 src_compile() {
diff --git a/x11-plugins/wmnd/ChangeLog b/x11-plugins/wmnd/ChangeLog
index ace7459bfd1b..8b9862e286d0 100644
--- a/x11-plugins/wmnd/ChangeLog
+++ b/x11-plugins/wmnd/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for x11-plugins/wmnd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.9 2003/07/16 01:30:47 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.10 2004/01/04 18:36:48 aliz Exp $
 
   15 Jul 2003; Nick Hadaway <raker@gentoo.org> wmnd-0.4.7.ebuild:
   Added ppc keyword.
 
-*wmnd-0.5.7 (13 Jul 2003)
+*wmnd-0.4.7 (13 Jul 2003)
 
   13 Jul 2003; Nick Hadaway <raker@gentoo.org> wmnd-0.4.7.ebuild:
   Version bump.
diff --git a/x11-plugins/wmnd/Manifest b/x11-plugins/wmnd/Manifest
index aa5848c3fad2..49714559460c 100644
--- a/x11-plugins/wmnd/Manifest
+++ b/x11-plugins/wmnd/Manifest
@@ -1,10 +1,10 @@
-MD5 8c41a291fedfa3daa49347e1c2990c05 ChangeLog 1120
-MD5 35b06c646b51979b2022449f31d7a7ee metadata.xml 448
-MD5 dc0b7a012c62d0561f5cc86558148efc wmnd-0.4.3.ebuild 644
-MD5 532d34fe4d79f01d230c00841a13868a wmnd-0.4.5-r1.ebuild 800
 MD5 cc4106c80dc4928bc6e2f559c20be86a wmnd-0.4.5.ebuild 642
 MD5 019d24ad451faea20e65b40cb5074599 wmnd-0.4.7.ebuild 805
+MD5 532d34fe4d79f01d230c00841a13868a wmnd-0.4.5-r1.ebuild 800
+MD5 a716f3d6087331d433b12af090c0726d ChangeLog 1120
+MD5 35b06c646b51979b2022449f31d7a7ee metadata.xml 448
+MD5 dc0b7a012c62d0561f5cc86558148efc wmnd-0.4.3.ebuild 644
 MD5 5fcf917eb9a34d4cfb39f2d7f88b618f files/digest-wmnd-0.4.3 62
 MD5 0b6286a871a62bb800e48ecd046071ad files/digest-wmnd-0.4.5 62
-MD5 0b6286a871a62bb800e48ecd046071ad files/digest-wmnd-0.4.5-r1 62
 MD5 dfc7ac1fd7b7eda761495bff23b23bf6 files/digest-wmnd-0.4.7 62
+MD5 0b6286a871a62bb800e48ecd046071ad files/digest-wmnd-0.4.5-r1 62
diff --git a/x11-plugins/wmnet/ChangeLog b/x11-plugins/wmnet/ChangeLog
index 14df129f846b..0183dae6a571 100644
--- a/x11-plugins/wmnet/ChangeLog
+++ b/x11-plugins/wmnet/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-plugins/wmnet
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.8 2003/12/14 04:41:57 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.9 2004/01/04 18:36:48 aliz Exp $
 
   14 Dec 2003; Lars Weiler <pylon@gentoo.org> wmnet-1.06.ebuild:
   Make stable on ppc 
@@ -16,7 +16,7 @@
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*wmnet-1.06.ebuild (8 Jun 2002)
+*wmnet-1.06 (8 Jun 2002)
 
   04 Oct 2002; Nick Hadaway <raker@gentoo.org> wmnet-1.06.ebuild :
   Added "... || die "blah"" to ebuild where appropriate. 
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index 0edbcb03b568..8180e45efd38 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,5 +1,5 @@
-MD5 8c70b40c4b65ffe0a46115e5a82fae7b wmnet-1.06.ebuild 808
-MD5 71c40da7fb86d97b70f7a37f042b1434 ChangeLog 1065
+MD5 37ac4990af2404ad5861d013b3ef386b wmnet-1.06.ebuild 802
+MD5 d1af1eef69800dcd257d86b0e00a7bba ChangeLog 1058
 MD5 9c871c5150118eedeea65810da151c07 metadata.xml 696
 MD5 61ea1e57785b3ca20c4bcd8b9fd2bc29 files/wmnet-1.06-nonx86.patch 478
 MD5 0a58ec555971a0da33b5d6b2dde9ad1b files/digest-wmnet-1.06 61
diff --git a/x11-plugins/wmnet/wmnet-1.06.ebuild b/x11-plugins/wmnet/wmnet-1.06.ebuild
index 110f0cbab37d..31da267f4710 100644
--- a/x11-plugins/wmnet/wmnet-1.06.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/wmnet-1.06.ebuild,v 1.10 2003/12/14 04:41:57 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/wmnet-1.06.ebuild,v 1.11 2004/01/04 18:36:48 aliz Exp $
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="WMnet is a dock.app network monitor"
-SRC_URI="http://www.digitalkaos.net/linux/${PN}/download/${P}.tar.gz"
+SRC_URI="http://www.digitalkaos.net/linux/wmnet/download/${P}.tar.gz"
 HOMEPAGE="http://http://www.digitalkaos.net/linux/wmnet/"
 
 DEPEND="virtual/x11"
@@ -15,27 +15,19 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc alpha amd64 ppc"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack ${A} ; cd ${S}
 	epatch ${FILESDIR}/${P}-nonx86.patch
 }
 
 src_compile() {
-
 	xmkmf || die "xmkmf failed"
 
 	emake CDEBUGFLAGS="${CFLAGS}" || die "parallel make failed"
-
 }
 
 src_install() {
-
 	dobin wmnet
-
 	dohtml wmnet.1x.html
-
 	newman wmnet.man wmnet.1
-
 	dodoc README Changelog
-
 }
diff --git a/x11-plugins/wmpager/ChangeLog b/x11-plugins/wmpager/ChangeLog
index 52c0143dbc03..45aa74900688 100644
--- a/x11-plugins/wmpager/ChangeLog
+++ b/x11-plugins/wmpager/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for x11-misc/wmpager
+# ChangeLog for x11-plugins/wmpager
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/ChangeLog,v 1.1 2003/12/26 18:03:05 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/ChangeLog,v 1.2 2004/01/04 18:36:48 aliz Exp $
 
 *wmpager-1.2-r1 (26 Dec 2003)
 
diff --git a/x11-plugins/wmpager/Manifest b/x11-plugins/wmpager/Manifest
index 8c8ba3cc9c91..2b4443f9b1b5 100644
--- a/x11-plugins/wmpager/Manifest
+++ b/x11-plugins/wmpager/Manifest
@@ -1,4 +1,4 @@
 MD5 d5cd0c854d8c51f40ab2968ccd7b1c81 wmpager-1.2-r1.ebuild 766
-MD5 07a75914b1bb54ce7a2ca4e266f9aeeb ChangeLog 917
+MD5 e36561f0c2db14706f785116eb1d34e2 ChangeLog 920
 MD5 042cee404485bb503546e27f5a3ca180 metadata.xml 161
 MD5 1dd5012756a79572f3f42486bc0500ba files/digest-wmpager-1.2-r1 62
diff --git a/x11-plugins/wmpop3/Manifest b/x11-plugins/wmpop3/Manifest
index fd579946851e..372782b62068 100644
--- a/x11-plugins/wmpop3/Manifest
+++ b/x11-plugins/wmpop3/Manifest
@@ -1,4 +1,4 @@
+MD5 9d5628713b070bcc312a59fe24df1d4c wmpop3-0.5.6a.ebuild 744
 MD5 2e710d9d1315a3f22e768778c73dee56 ChangeLog 399
-MD5 f594453193c356a622266668e9a6bcd9 wmpop3-0.5.6a.ebuild 783
 MD5 9362c6a41686d727403c7fd475848030 metadata.xml 348
 MD5 06730c3f388b183dae3acbe476682f91 files/digest-wmpop3-0.5.6a 64
diff --git a/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild b/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild
index 4a8f92783a44..3468ab40b751 100644
--- a/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild
+++ b/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild,v 1.4 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild,v 1.5 2004/01/04 18:36:48 aliz Exp $
 
 DESCRIPTION="dockapp for checking pop3 accounts"
 HOMEPAGE="http://www.cs.mun.ca/~scotth/"
@@ -15,10 +15,8 @@ DEPEND="virtual/glibc
 S=${WORKDIR}/${P}
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}/wmpop3
-	mv Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	unpack ${A} ; cd ${S}/wmpop3
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
 }
 
 src_compile() {
diff --git a/x11-plugins/wmpop3lb/Manifest b/x11-plugins/wmpop3lb/Manifest
index 896f73ef1387..fab426890858 100644
--- a/x11-plugins/wmpop3lb/Manifest
+++ b/x11-plugins/wmpop3lb/Manifest
@@ -1,4 +1,4 @@
 MD5 d2bab68a9e44acddcaec1ebece0f674b ChangeLog 509
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 1c4f176f4cfdc9b55df859c31287138b wmpop3lb-2.4.2.ebuild 768
+MD5 3113357b401dd06678b7de28a49f5e06 wmpop3lb-2.4.2.ebuild 729
 MD5 404dcd51efee01978f6bbb6c0c9b551a files/digest-wmpop3lb-2.4.2 64
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
index cb83bd13f7ef..e40808c85539 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild,v 1.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 IUSE=""
 
@@ -17,11 +17,9 @@ KEYWORDS="x86 amd64"
 DEPEND="virtual/x11"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}/wmpop3
+	unpack ${A} ; cd ${S}/wmpop3
 
-	mv Makefile Makefile.orig
-	sed -e "s:-g2 -D_DEBUG:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:-g2 -D_DEBUG:${CFLAGS}:" Makefile
 }
 
 src_compile() {
diff --git a/x11-plugins/wmpower/Manifest b/x11-plugins/wmpower/Manifest
index 1b009c36cd80..74b132574462 100644
--- a/x11-plugins/wmpower/Manifest
+++ b/x11-plugins/wmpower/Manifest
@@ -1,8 +1,8 @@
+MD5 9776194929cb2647a875007029bc0840 wmpower-0.1.3.ebuild 678
+MD5 1edc61deb22d4d9092bf3938183e961e wmpower-0.1.2.ebuild 679
 MD5 b31a55ca3b5cef5aeebf82cc2219c015 ChangeLog 970
 MD5 5e722af7763dc58e650f905656245b6d metadata.xml 384
-MD5 8cbe7d6d1d57c751ba2c967b43c651e1 wmpower-0.1.2.ebuild 677
-MD5 66483d8fea4388852474023ebd578a76 wmpower-0.1.3.ebuild 676
-MD5 a82a26f04ab88dd707e7557c55add5e9 wmpower-0.3.0.ebuild 781
+MD5 d1718ca804a977b932a33992cc61f9ac wmpower-0.3.0.ebuild 783
 MD5 57508415cfb11e804d1ed1518a74ea7b files/cflags.patch 2316
 MD5 a84385e6c8136225526082cd79afa966 files/digest-wmpower-0.1.2 65
 MD5 ae97412344a34551460870b2f43f5c0e files/digest-wmpower-0.1.3 65
diff --git a/x11-plugins/wmpower/wmpower-0.1.2.ebuild b/x11-plugins/wmpower/wmpower-0.1.2.ebuild
index 9d11ae8c91ce..8fe3060e3324 100644
--- a/x11-plugins/wmpower/wmpower-0.1.2.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.1.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.1.2.ebuild,v 1.4 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.1.2.ebuild,v 1.5 2004/01/04 18:36:48 aliz Exp $
 
 IUSE=""
 
 DESCRIPTION="WMaker DockApp to get (and set) power management status for laptops. Supports both APM and ACPI kernels. Also has direct support for Toshiba hardware."
 HOMEPAGE="http://wmpower.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmpower/wmpower-0.1.3.ebuild b/x11-plugins/wmpower/wmpower-0.1.3.ebuild
index 02ee86db088c..d47ac57edf56 100644
--- a/x11-plugins/wmpower/wmpower-0.1.3.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.1.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.1.3.ebuild,v 1.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.1.3.ebuild,v 1.6 2004/01/04 18:36:48 aliz Exp $
 
 IUSE=""
 
 DESCRIPTION="WMaker DockApp to get (and set) power management status for laptops. Supports both APM and ACPI kernels. Also has direct support for Toshiba hardware."
 HOMEPAGE="http://wmpower.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmpower/wmpower-0.3.0.ebuild b/x11-plugins/wmpower/wmpower-0.3.0.ebuild
index ca7309da402a..63ee8bcc3489 100644
--- a/x11-plugins/wmpower/wmpower-0.3.0.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.3.0.ebuild,v 1.2 2003/11/02 12:17:43 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.3.0.ebuild,v 1.3 2004/01/04 18:36:48 aliz Exp $
 
 IUSE=""
 
 DESCRIPTION="WMaker DockApp to get (and set) power management status for laptops. Supports both APM and ACPI kernels. Also has direct support for Toshiba hardware."
 HOMEPAGE="http://wmpower.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
index 77e37f6cdc75..a8d987e569a4 100644
--- a/x11-plugins/wmswallow/Manifest
+++ b/x11-plugins/wmswallow/Manifest
@@ -1,4 +1,4 @@
 MD5 2c1ab848b173e41f7969b99b4ad4b31c ChangeLog 377
 MD5 e86d4130b9bc927ad4f33f551a8541ba metadata.xml 560
-MD5 8cb115914534b36c90941c43ba076bae wmswallow-0.6.1.ebuild 735
+MD5 c96b0250b3e3cc57f0782ed0aa6339bb wmswallow-0.6.1.ebuild 739
 MD5 4dac6dda847dcd465cc6a8666535394a files/digest-wmswallow-0.6.1 59
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
index 733ccd051a4f..4ca27d54f880 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 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.2 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild,v 1.3 2004/01/04 18:36:48 aliz Exp $
 
 IUSE=""
 
 DESCRIPTION="A dock applet to make any application dockable."
 HOMEPAGE="http://burse.uni-hamburg.de/~friedel/software/wmswallow.html"
-SRC_URI="http://burse.uni-hamburg.de/~friedel/software/${PN}/${PN}.tar.Z"
+SRC_URI="http://burse.uni-hamburg.de/~friedel/software/wmswallow/${PN}.tar.Z"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmtimer/Manifest b/x11-plugins/wmtimer/Manifest
index 7584fa9ac31b..13388750dd0b 100644
--- a/x11-plugins/wmtimer/Manifest
+++ b/x11-plugins/wmtimer/Manifest
@@ -1,4 +1,4 @@
+MD5 0779462ee0576075d48a640745421dc7 wmtimer-2.4.ebuild 793
 MD5 d6c32d6977426b01a858d79cc8e87a0d ChangeLog 900
 MD5 29dad15b2d403e1f5225ef8b26e8baa3 metadata.xml 505
-MD5 c130adccaae9bc74d023454b15fa293d wmtimer-2.4.ebuild 813
 MD5 e9893dea144b35a7eb054a48c737d0cc files/digest-wmtimer-2.4 62
diff --git a/x11-plugins/wmtimer/wmtimer-2.4.ebuild b/x11-plugins/wmtimer/wmtimer-2.4.ebuild
index f247406e128c..d7a0ac001c95 100644
--- a/x11-plugins/wmtimer/wmtimer-2.4.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.4.ebuild,v 1.9 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.4.ebuild,v 1.10 2004/01/04 18:36:48 aliz Exp $
 
 S=${WORKDIR}/${P}
-S2=${S}/wmtimer
 
 DESCRIPTION="Dockable clock which can run in alarm, countdown timer or chronograph mode"
 SRC_URI="http://home.dwave.net/~jking/wmtimer/${P}.tar.gz"
@@ -17,14 +16,13 @@ DEPEND="virtual/glibc
 	virtual/x11
 	=x11-libs/gtk+-1.2*"
 
-src_compile() {
-
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -Wall:${CFLAGS}:" Makefile.orig > Makefile
+src_unpack() {
+	unpack ${A} ; cd ${S}/wmtimer
+	sed -i -e "s:-O2 -Wall:${CFLAGS}:" Makefile
+}
 
+src_compile() {
 	emake || die
-
 }
 
 src_install () {
diff --git a/x11-plugins/wmtop/Manifest b/x11-plugins/wmtop/Manifest
index 64dec92890ca..4fecc408a8c1 100644
--- a/x11-plugins/wmtop/Manifest
+++ b/x11-plugins/wmtop/Manifest
@@ -1,4 +1,4 @@
-MD5 221e3716f5359f7bee7600576060463d wmtop-0.84.ebuild 724
+MD5 1f96ae553b1f4184cfcf5504763ea23c wmtop-0.84.ebuild 714
 MD5 481501681c25873a4a45648d54bda778 ChangeLog 592
 MD5 4745e806b0b279d04fc25d2ff79cf4fa metadata.xml 555
 MD5 f02c38d61b457e6c4127eb64dcaa2715 files/digest-wmtop-0.84 62
diff --git a/x11-plugins/wmtop/wmtop-0.84.ebuild b/x11-plugins/wmtop/wmtop-0.84.ebuild
index d0e37bbcff69..3699fa3f22b3 100644
--- a/x11-plugins/wmtop/wmtop-0.84.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.84.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/wmtop-0.84.ebuild,v 1.6 2003/12/14 04:43:32 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/wmtop-0.84.ebuild,v 1.7 2004/01/04 18:36:48 aliz Exp $
 
 S="${WORKDIR}/${P}"
 
@@ -15,15 +15,15 @@ KEYWORDS="x86 ~sparc amd64 ppc"
 DEPEND="virtual/glibc
 	virtual/x11"
 
-src_compile() {
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	sed -i -e "s:-O3 -g -Wall:${CFLAGS}:" \
+		-e "s:/local::" Makefile
 
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O3 -g -Wall:${CFLAGS}:" \
-		-e "s:/local::" Makefile.orig > Makefile
+}
 
+src_compile() {
 	make linux
-
 }
 
 src_install() {
diff --git a/x11-plugins/wmusic/Manifest b/x11-plugins/wmusic/Manifest
index 2aad2f8d5727..498c05a03393 100644
--- a/x11-plugins/wmusic/Manifest
+++ b/x11-plugins/wmusic/Manifest
@@ -1,6 +1,6 @@
+MD5 1dedfaf58ccd1460cad41b62f4de4667 wmusic-1.4.11.ebuild 700
+MD5 6b450edefcaaeb88e4c432293af761df wmusic-1.4.10.ebuild 700
 MD5 4190f1aca75f9e321d823b9071d94de8 ChangeLog 706
 MD5 7eef6e015727ac235d78fa51635b34db metadata.xml 394
-MD5 be6f05fb40c7387a7f65f53eb0f876cf wmusic-1.4.10.ebuild 768
-MD5 c02b31a01dcf24a16da2281a7d8fd3e3 wmusic-1.4.11.ebuild 768
 MD5 930cfaf5fe1664a43eb5c2a82110d573 files/digest-wmusic-1.4.10 69
 MD5 c94be60d3c8d8276495ea62f69119612 files/digest-wmusic-1.4.11 68
diff --git a/x11-plugins/wmusic/wmusic-1.4.10.ebuild b/x11-plugins/wmusic/wmusic-1.4.10.ebuild
index 0309256c8e10..392ab56b5ad5 100644
--- a/x11-plugins/wmusic/wmusic-1.4.10.ebuild
+++ b/x11-plugins/wmusic/wmusic-1.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/wmusic-1.4.10.ebuild,v 1.4 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/wmusic-1.4.10.ebuild,v 1.5 2004/01/04 18:36:48 aliz Exp $
 
 DESCRIPTION="dockapp for xmms"
 HOMEPAGE="http://home.jtan.com/~john/wmusic/"
@@ -16,11 +16,8 @@ DEPEND="virtual/glibc
 S=${WORKDIR}/${P}
 
 src_unpack() {
-	unpack ${P}-src.tar.gz
-	cd ${S}/src
-	mv Makefile.in Makefile.in.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.in.orig > Makefile.in
-	cd ${S}
+	unpack ${A} ; cd ${S}/src
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile.in
 }
 
 src_compile() {
diff --git a/x11-plugins/wmusic/wmusic-1.4.11.ebuild b/x11-plugins/wmusic/wmusic-1.4.11.ebuild
index 584eb864b828..eb0e1693950c 100644
--- a/x11-plugins/wmusic/wmusic-1.4.11.ebuild
+++ b/x11-plugins/wmusic/wmusic-1.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/wmusic-1.4.11.ebuild,v 1.2 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/wmusic-1.4.11.ebuild,v 1.3 2004/01/04 18:36:48 aliz Exp $
 
 DESCRIPTION="dockapp for xmms"
 HOMEPAGE="http://home.jtan.com/~john/wmusic/"
@@ -16,11 +16,8 @@ DEPEND="virtual/glibc
 S=${WORKDIR}/${P}
 
 src_unpack() {
-	unpack ${P}-src.tar.gz
-	cd ${S}/src
-	mv Makefile.in Makefile.in.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.in.orig > Makefile.in
-	cd ${S}
+	unpack ${A} ; cd ${S}/src
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile.in
 }
 
 src_compile() {
diff --git a/x11-plugins/wmweather+/ChangeLog b/x11-plugins/wmweather+/ChangeLog
index c994038d671e..f1df8b5e848c 100644
--- a/x11-plugins/wmweather+/ChangeLog
+++ b/x11-plugins/wmweather+/ChangeLog
@@ -1,13 +1,13 @@
 # ChangeLog for x11-plugins/wmweather+
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/ChangeLog,v 1.6 2003/12/06 17:01:33 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/ChangeLog,v 1.7 2004/01/04 18:36:48 aliz Exp $
 
 *wmweather+-2.5 (06 Dec 2003)
 
   06 Dec 2003; Markus Nigbur <pyrania@gentoo.org> wmweather+-2.5.ebuild:
   Version bump, thanks to Doug Weimer for reporting.
 
-*wmweather-2.3 (28 Jan 2003)
+*wmweather+-2.3 (28 Jan 2003)
 
   02 Apr 2003; Spider <spider@gentoo.org> wmweather+-2.3.ebuild
   fixing xpm dep, bug 1446
diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest
index 578ea3dbcdc1..8e1fa282eff4 100644
--- a/x11-plugins/wmweather+/Manifest
+++ b/x11-plugins/wmweather+/Manifest
@@ -1,8 +1,8 @@
-MD5 1a7558a4ad8d270f0d57d7bb9174e237 ChangeLog 1058
-MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 c895a15142ab97d60839028d76852176 wmweather+-2.1.ebuild 697
 MD5 f1231bdc2f462b9f17e2f92a91bdf756 wmweather+-2.3.ebuild 697
 MD5 f81f2525c968d529c1ca06c2c761a289 wmweather+-2.5.ebuild 698
+MD5 29dd0217992e1193a3e9ddf61597c929 ChangeLog 1059
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 428e127d2b44b038ceb86cc1e57278d4 files/digest-wmweather+-2.1 66
 MD5 85428ed2def2b1664e1aa29fea66dd36 files/digest-wmweather+-2.3 122
 MD5 f0c9454dbc7066f11afef31ec580a2f5 files/digest-wmweather+-2.5 66