*** empty log message ***import-1.1.1

author: Chris White <chriswhite@gentoo.org> 2005-11-30 10:14:41 +0000
committer: Chris White <chriswhite@gentoo.org> 2005-11-30 10:14:41 +0000
commit: 06b73af769fa91ca1e4183af479438603318049a (patch)
tree: 6c0ad0d0b4cb2a0e7d5c38075f8cfc76a007e25b /x11-plugins
parent: (no commit message) (diff)
download: gentoo-2-import-1.1.1.tar.gz
gentoo-2-import-1.1.1.tar.bz2
gentoo-2-import-1.1.1.zip
905 files changed, 10016 insertions, 2997 deletions
diff --git a/x11-plugins/allin1/ChangeLog b/x11-plugins/allin1/ChangeLog
index 7e38685cd566..a7a27e1102a2 100644
--- a/x11-plugins/allin1/ChangeLog
+++ b/x11-plugins/allin1/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for x11-plugins/allin1
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.1 2003/09/05 01:01:37 zul Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> allin1-0.5.0.ebuild:
+  Stable for x86.
+  allin1-0.4.5.ebuild, allin1-0.4.7.ebuild:
+  Wipe out older versions.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  allin1-0.4.7.ebuild, allin1-0.5.0.ebuild:
+  Masked allin1-0.5.0.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  allin1-0.4.7.ebuild:
+  Masked allin1-0.4.7.ebuild stable for ppc
+
+*allin1-0.5.0 (31 Aug 2004)
+
+  31 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> allin1-0.5.0.ebuild:
+  Version bump. Closes #61622... Battery bar issue now fixed upstream.
+  metadata.xml:
+  Assign this to desktop-dock herd.
+
+*allin1-0.4.7 (03 Jul 2004)
+
+  03 Jul 2004; <pyrania@gentoo.org> +files/allin1-0.4.7-pl1.patch,
+  allin1-0.4.7.ebuild:
+  Fixed battery bar. See bug #55198.
+
+  13 Jun 2004; <pyrania@gentoo.org> :
+  Version bump. Closing bug #50574.
+
+  29 Feb 2004; Markus Nigbur <pyrania@gentoo.org> allin1-0.4.5.ebuild:
+  Stable on x86
+
+  02 Nov 2003; Abhishek Amit <abhishek@gentoo.org> metadata.xml:
+  Added metadata.xml
 
 *allin1-0.4.5 (04 Sep 2003)
 
diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest
index 0b89154e5aaf..300f2b581261 100644
--- a/x11-plugins/allin1/Manifest
+++ b/x11-plugins/allin1/Manifest
@@ -1,2 +1,4 @@
-MD5 79160daa853b316044ffe3e29f7c7345 allin1-0.4.5.ebuild 635
-MD5 5bb804feecc3bc0c1d9c960d64229a41 files/digest-allin1-0.4.5 63
+MD5 9d82327fb1ab037426ce13a64d89a169 allin1-0.5.0.ebuild 687
+MD5 bcbea075a9d340d53722ede26a0759af ChangeLog 1504
+MD5 51e4144050265a6597eea69affc33666 metadata.xml 486
+MD5 0c2ec115af68196bad7c677c33d1d13e files/digest-allin1-0.5.0 63
diff --git a/x11-plugins/allin1/allin1-0.5.0.ebuild b/x11-plugins/allin1/allin1-0.5.0.ebuild
index 161ad660a185..5c8e0e97b87f 100644
--- a/x11-plugins/allin1/allin1-0.5.0.ebuild
+++ b/x11-plugins/allin1/allin1-0.5.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/allin1-0.5.0.ebuild,v 1.1 2004/08/31 13:05:00 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/allin1-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 DESCRIPTION="All in one monitoring dockapp: RAM, CPU, Net, Power, df, seti"
 HOMEPAGE="http://ilpettegolo.altervista.org/linux_allin1.en.shtml"
 SRC_URI="mirror://sourceforge/allinone/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/allin1/metadata.xml b/x11-plugins/allin1/metadata.xml
index 0c31c504591d..aeb647552005 100644
--- a/x11-plugins/allin1/metadata.xml
+++ b/x11-plugins/allin1/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>x11-misc</herd>
+	<herd>desktop-dock</herd>
 	<longdescription>Allin1 is a little dock applet for FluxBox and similar window managers which monitors CPU load with a moving graph, memory and swap usage with histograms, battery and power status with histogram and icons, and ethernet/PPP interfaces with icons and histograms (linear or logaritmic).</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/asapm/ChangeLog b/x11-plugins/asapm/ChangeLog
index 6fa0fa900a59..32a605d006dd 100644
--- a/x11-plugins/asapm/ChangeLog
+++ b/x11-plugins/asapm/ChangeLog
@@ -1,9 +1,28 @@
-# ChangeLog for x11-misc/asapm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/ChangeLog,v 1.1 2002/11/03 16:09:24 seemant Exp $
+# ChangeLog for x11-plugins/asapm
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+*asapm-3.0 (20 Jun 2005)
+
+  20 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +asapm-3.0.ebuild:
+  Version bump.
+
+  17 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml (afterstep herd).
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> asapm-2.10.ebuild:
+  glibc -> libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> asapm-2.10.ebuild:
+  Add inherit eutils
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *asapm-2.11 (12 Apr 2002)
 
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> asapm-2.11.ebuild :
+  set ppc in keywords
+
   12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> asapm-2.11.ebuild :
 
   Version bump with USE dependent jpeg support
diff --git a/x11-plugins/asapm/Manifest b/x11-plugins/asapm/Manifest
index e69de29bb2d1..5a307b494c81 100644
--- a/x11-plugins/asapm/Manifest
+++ b/x11-plugins/asapm/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ed17c2b668972504f6d47c21f713963 asapm-2.11.ebuild 612
+MD5 6f140771f5e4752e48cd2dfbcf227ccc asapm-3.0.ebuild 644
+MD5 967eba467cee18ff1dc299c64d49c250 asapm-2.10.ebuild 756
+MD5 6f5593c9a7a70996d646fff033e63d8e ChangeLog 1377
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+MD5 57f770a739af0227050a5d5e55b241cd files/digest-asapm-3.0 60
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCtrWuEZCkKN40op4RAiCwAKDCJ/3kt74fuEzIakLJMsDkixkwmQCeLGlu
+NoqFlbifnUYySjeeEArAgM0=
+=b1vv
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/asapm/asapm-2.10.ebuild b/x11-plugins/asapm/asapm-2.10.ebuild
index 5017c2792c92..d37d6d439c62 100644
--- a/x11-plugins/asapm/asapm-2.10.ebuild
+++ b/x11-plugins/asapm/asapm-2.10.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2002/11/03 16:09:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.10.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
 
 DESCRIPTION="APM monitor for AfterStep"
-
 SRC_URI="http://www.tigr.net/afterstep/download/asapm/asapm-2.10.tar.gz"
 
 HOMEPAGE="http://www.tigr.net/afterstep/list.pl"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+IUSE=""
+KEYWORDS="x86 sparc "
 
-DEPEND="virtual/glibc virtual/x11"
+DEPEND="virtual/libc 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
 }
 
 src_install () {
-
 	dodir usr/bin
 	dodir usr/share/man/man1
-	
+
 	make prefix=${D} install || die
 }
 
diff --git a/x11-plugins/asapm/asapm-2.11.ebuild b/x11-plugins/asapm/asapm-2.11.ebuild
index e77aaafabe31..1078acc4717d 100644
--- a/x11-plugins/asapm/asapm-2.11.ebuild
+++ b/x11-plugins/asapm/asapm-2.11.ebuild
@@ -1,46 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2002/11/03 16:09:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.11.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 IUSE="jpeg"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="APM monitor for AfterStep"
 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 sparc64"
+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/asapm/asapm-3.0.ebuild b/x11-plugins/asapm/asapm-3.0.ebuild
index 4e2f41821fc1..0fb8ac81c5d4 100644
--- a/x11-plugins/asapm/asapm-3.0.ebuild
+++ b/x11-plugins/asapm/asapm-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-3.0.ebuild,v 1.1 2005/06/20 12:24:58 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-3.0.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 DESCRIPTION="APM monitor for AfterStep"
 SRC_URI="http://www.tigr.net/afterstep/download/asapm/${P}.tar.gz"
diff --git a/x11-plugins/asbutton/ChangeLog b/x11-plugins/asbutton/ChangeLog
index f68cbb216cc8..346a0131ecf0 100644
--- a/x11-plugins/asbutton/ChangeLog
+++ b/x11-plugins/asbutton/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-plugins/asbutton
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asbutton/ChangeLog,v 1.1 2003/04/19 19:40:41 sethbc Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asbutton/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  17 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml (afterstep herd).
+
+  07 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> asbutton-0.3-r1.ebuild:
+  Fix compile (bug #59620); tidy
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> asbutton-0.3.ebuild:
+  Add inherit eutils
+
+  15 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> asbutton-0.3-r1.ebuild:
+  inherit eutils for epatch.
+
+*asbutton-0.3-r1 (18 Jun 2003)
+
+  18 Jun 2003; robh <robh@gentoo.org> asbutton-0.3-r1.ebuild,
+  files/asbutton-0.3-r1-gentoo.patch:
+  Made sure a sample asbuttonrc is copied (thanks to Jens Hoffrichter, closes
+  #22982). Also corrected a dep.
 
 *asbutton-0.3 (19 Apr 2003)
 
diff --git a/x11-plugins/asbutton/Manifest b/x11-plugins/asbutton/Manifest
index 58932144baf7..df1609b9d9ce 100644
--- a/x11-plugins/asbutton/Manifest
+++ b/x11-plugins/asbutton/Manifest
@@ -1,4 +1,18 @@
-MD5 170b62a62a7556d1b419d8b066788ce8 asbutton-0.3.ebuild 684
-MD5 19cbf396fe75fb55b24ab97c9669500b ChangeLog 311
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 18869fd6ae6466f7b94f55ea2420f0ac asbutton-0.3.ebuild 708
+MD5 34f65ba95b98cae1cde5b833534151e7 asbutton-0.3-r1.ebuild 829
+MD5 86962030b99edba1e439e319acba816c ChangeLog 1052
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsrouEZCkKN40op4RAhFFAJ4ra1rg1z8y8vNQyG2shW2JCOrscACeKF8m
+vZ1tbixbWbbufvMoqrVqbK8=
+=OzRn
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/asbutton/asbutton-0.3-r1.ebuild b/x11-plugins/asbutton/asbutton-0.3-r1.ebuild
index 40f82b4b5057..75e14082d2ec 100644
--- a/x11-plugins/asbutton/asbutton-0.3-r1.ebuild
+++ b/x11-plugins/asbutton/asbutton-0.3-r1.ebuild
@@ -1,23 +1,23 @@
-# 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.1 2003/06/18 12:15:25 robh Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A simple dockable application launcher for use in AfterStep."
-SRC_URI="http://www.tigr.net/afterstep/download/asbutton/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net"
+SRC_URI="http://www.tigr.net/afterstep/download/asbutton/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 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() {
@@ -25,10 +25,9 @@ src_compile() {
 }
 
 src_install () {
-	dodir /usr/bin
-	dodir /usr/share/afterstep/desktop/icons/16bpp
+	dodir /usr/bin /usr/share/afterstep/desktop/icons/16bpp
 
-	make DESTDIR=${D} install || die 
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc README CHANGES
 	newdoc .asbuttonrc sample_asbuttonrc
 }
diff --git a/x11-plugins/asbutton/asbutton-0.3.ebuild b/x11-plugins/asbutton/asbutton-0.3.ebuild
index d097783b3fcd..e7573da3a97e 100644
--- a/x11-plugins/asbutton/asbutton-0.3.ebuild
+++ b/x11-plugins/asbutton/asbutton-0.3.ebuild
@@ -1,8 +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/asbutton/asbutton-0.3.ebuild,v 1.1 2003/04/19 19:40:41 sethbc Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
+
+IUSE=""
 DESCRIPTION="A simple dockable application launcher for use in AfterStep."
 SRC_URI="http://www.tigr.net/afterstep/download/asbutton/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net"
@@ -14,20 +16,14 @@ KEYWORDS="x86"
 DEPEND="virtual/x11"
 
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die "patch failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_install () {
 	dodir /usr/bin
 	dodir /usr/share/afterstep/desktop/icons/16bpp
 
-	make DESTDIR=${D} install || die 
+	make DESTDIR=${D} install || die
 	dodoc README CHANGES
 }
diff --git a/x11-plugins/asclock/ChangeLog b/x11-plugins/asclock/ChangeLog
index bfde76383cda..4427244cfeb4 100644
--- a/x11-plugins/asclock/ChangeLog
+++ b/x11-plugins/asclock/ChangeLog
@@ -1,7 +1,21 @@
-# ChangeLog for x11-misc/asclock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.1 2002/11/03 16:17:54 seemant Exp $
+# ChangeLog for x11-plugins/asclock
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
+  17 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml (afterstep herd).
+
+  06 Sep 2004; Hardave Riar <hardave@gentoo.org> asclock-2.0.12.ebuild:
+  Stable on mips
+
+  08 Jul 2004; Hardave Riar <hardave@gentoo.org> asclock-2.0.12.ebuild:
+  Added ~mips KEYWORD
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> asclock-2.0.12.ebuild:
+  glibc -> libc
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *asclock-2.0.12 (14 Apr 2002)
 
   14 Apr 2002; Seemant Kulleen <seemant@gentoo.org> asclock-2.0.12-r1.ebuild :
diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest
index e69de29bb2d1..dac623571a16 100644
--- a/x11-plugins/asclock/Manifest
+++ b/x11-plugins/asclock/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cb55dd6cf113c7f6f7cb6ad9c2913fc6 asclock-2.0.12.ebuild 1192
+MD5 327e9b6ca82ca5671120695c681e6be1 ChangeLog 1280
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+MD5 ba94dc8581c7dcd9b2110d891f17dbb8 files/digest-asclock-2.0.12 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsrphEZCkKN40op4RAnoFAKC8xAfeuVlqxZwLhSwD3m3Pne7emwCfU1c0
+JX/1IniWBMC6KQ9nGXOwCuQ=
+=7TN+
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/asclock/asclock-2.0.12.ebuild b/x11-plugins/asclock/asclock-2.0.12.ebuild
index fb9cb58859e8..7e68b7f026f1 100644
--- a/x11-plugins/asclock/asclock-2.0.12.ebuild
+++ b/x11-plugins/asclock/asclock-2.0.12.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/asclock-2.0.12.ebuild,v 1.1 2002/11/03 16:17:54 seemant Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/asclock-2.0.12.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Clock applet for AfterStep"
 SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net/afterstep/list.pl"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc ppc mips"
 
-DEPEND="virtual/glibc virtual/x11"
+DEPEND="virtual/libc virtual/x11"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -42,7 +41,7 @@ src_compile() {
 		asclock.o parser.o symbols.o config.o \
 		-L/usr/X11R6/lib \
 		-L/usr/lib/X11 \
-		-lXpm -lXext -lX11 || die  
+		-lXpm -lXext -lX11 || die
 }
 
 src_install () {
diff --git a/x11-plugins/ascpu/ChangeLog b/x11-plugins/ascpu/ChangeLog
index 47b1a8f550fc..6385db96fa70 100644
--- a/x11-plugins/ascpu/ChangeLog
+++ b/x11-plugins/ascpu/ChangeLog
@@ -1,6 +1,39 @@
-# ChangeLog for x11-misc/ascpu
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ChangeLog,v 1.1 2002/11/03 16:17:54 seemant Exp $
+# ChangeLog for x11-plugins/ascpu
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ChangeLog,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
+
+  13 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml (afterstep herd).
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> ascpu-1.10.ebuild:
+  Stable on ppc64
+
+  21 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> ascpu-1.10.ebuild:
+  added ~amd64 to KEYWORDS. fixes #78878
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> ascpu-1.10.ebuild:
+  added ~ppc64 to KEYWORDS; bug #74660
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> ascpu-1.10.ebuild:
+  Masked ascpu-1.10.ebuild stable for ppc
+
+  08 Jul 2004; Hardave Riar <hardave@gentoo.org> ascpu-1.10.ebuild:
+  Added ~mips KEYWORD
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> ascpu-1.9.ebuild:
+  Stable on sparc.
+
+*ascpu-1.10 (13 Jun 2004)
+
+  13 Jun 2004; <pyrania@gentoo.org> +files/ascpu-1.10-gentoo.patch,
+  +ascpu-1.10.ebuild:
+  Version bump. Closing bug #51878.
+
+  17 Mar 2004; Ciaran McCreesh <ciaranm@gentoo.org> ascpu-1.9.ebuild:
+  Added ~sparc (#44975)
+
+  15 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> ascpu-1.9.ebuild:
+  inherit eutils for epatch.
 
 *ascpu-1.9 (17 Aug 2002)
 
diff --git a/x11-plugins/ascpu/Manifest b/x11-plugins/ascpu/Manifest
index e69de29bb2d1..61cb2946f6b0 100644
--- a/x11-plugins/ascpu/Manifest
+++ b/x11-plugins/ascpu/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d65da6b11a68e52735f61282de42725 ascpu-1.9.ebuild 689
+MD5 8e7389fd213d5d6314b269ca32099a29 ascpu-1.10.ebuild 708
+MD5 76ce20132aebe1a649e0c6dea7e34aeb ChangeLog 1425
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+MD5 d8501577130cd99a4eb4543995c90c2f files/ascpu-1.9-gentoo.patch 763
+MD5 a566b5b5a9c4e940161813e32d9673a6 files/digest-ascpu-1.10 61
+MD5 6718d1f1daa4d22b0edb9ec4f4b14571 files/ascpu-1.10-gentoo.patch 947
+MD5 683348a20ecc2ea05fc85877e60846a0 files/digest-ascpu-1.9 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrYhoEZCkKN40op4RAhXnAJ9RifQmm8F6qkEMt1iG95GeBlKaJwCfREHp
+vSIL3OlbNmVv33sNSbARpCs=
+=iZug
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/ascpu/ascpu-1.10.ebuild b/x11-plugins/ascpu/ascpu-1.10.ebuild
index e271a4e30443..5222db47bedd 100644
--- a/x11-plugins/ascpu/ascpu-1.10.ebuild
+++ b/x11-plugins/ascpu/ascpu-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ascpu-1.10.ebuild,v 1.1 2004/06/13 04:03:26 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ascpu-1.10.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.tigr.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ppc ~mips ppc64 ~amd64"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/ascpu/ascpu-1.9.ebuild b/x11-plugins/ascpu/ascpu-1.9.ebuild
index 09942af15661..4773e5710029 100644
--- a/x11-plugins/ascpu/ascpu-1.9.ebuild
+++ b/x11-plugins/ascpu/ascpu-1.9.ebuild
@@ -1,15 +1,17 @@
-# Copyright 2002 Dwight Schauer
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ascpu-1.9.ebuild,v 1.1 2002/11/03 16:17:54 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ascpu-1.9.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
+
+IUSE=""
 DESCRIPTION="CPU statistics monitor utility for X Windows"
 SRC_URI="http://www.tigr.net/afterstep/download/ascpu/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ppc"
 
 DEPEND="virtual/x11"
 
@@ -17,17 +19,11 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch
-
-
-src_compile() {
-	econf || die
-
-    	emake || die "Make Failed"
+	epatch ${FILESDIR}/${P}-gentoo.patch || die
 }
 
 src_install () {
-	dodir /usr/bin 
+	dodir /usr/bin
 	dodir /usr/share/man/man1
 
 	make DESTDIR=${D} install || die
diff --git a/x11-plugins/asmem/ChangeLog b/x11-plugins/asmem/ChangeLog
index ee559e1d5087..5f1f4750cb23 100644
--- a/x11-plugins/asmem/ChangeLog
+++ b/x11-plugins/asmem/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for x11-plugins/asmem
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/ChangeLog,v 1.1 2003/06/05 11:05:03 robh Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  13 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml (afterstep herd).
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> asmem-1.10.ebuild:
+  Stable on ppc64
+
+  23 Dec 2004; Markus Rothe <corsair@gentoo.org> asmem-1.10.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #74953
+
+*asmem-1.10 (11 May 2004)
+
+  11 May 2004; Christian Birchinger <joker@gentoo.org> asmem-1.10.ebuild,
+  files/asmem-1.10-gentoo.patch:
+  New version with Linux 2.6 fix
+
+  17 Mar 2004; Ciaran McCreesh <ciaranm@gentoo.org> asmem-1.9.ebuild:
+  Added ~sparc (#44975)
+
+  15 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> asmem-1.9.ebuild:
+  inherit eutils for epatch.
 
 *asmem-1.9 (5 June 2003)
 
diff --git a/x11-plugins/asmem/Manifest b/x11-plugins/asmem/Manifest
index c4c102c25b81..dfca0df4b8e1 100644
--- a/x11-plugins/asmem/Manifest
+++ b/x11-plugins/asmem/Manifest
@@ -1,4 +1,15 @@
-MD5 452119e65bff4d11aff3d1243645384d asmem-1.9.ebuild 592
-MD5 d8d46d55faeb1f0c44de3755b9214d4c ChangeLog 252
-MD5 20007072993179bdf347b7d7919af88b files/digest-asmem-1.9 60
-MD5 329806857b8a65ad34c7528cf9cd6e9d files/asmem-1.9-gentoo.patch 762
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2f6fda03e81cc406a65ae592ac5196aa ChangeLog 992
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+MD5 0aa9aa42064c26b2e5ce4e5ef68c6922 asmem-1.10.ebuild 697
+MD5 33fafb23eadaab9d28fe8c19aabc92a1 files/digest-asmem-1.10 61
+MD5 329806857b8a65ad34c7528cf9cd6e9d files/asmem-1.10-gentoo.patch 762
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrYguEZCkKN40op4RAin1AJ4yhVxRWqGfgRuncbMrixpdSTZNLQCeLDbs
+ZPYW20Hi6thKb7ztsfcgBQQ=
+=QW4h
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/asmem/asmem-1.10.ebuild b/x11-plugins/asmem/asmem-1.10.ebuild
index 9ceecc767e6e..77d6550208d5 100644
--- a/x11-plugins/asmem/asmem-1.10.ebuild
+++ b/x11-plugins/asmem/asmem-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/asmem-1.10.ebuild,v 1.1 2004/05/11 18:40:20 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/asmem-1.10.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.tigr.net/afterstep/download/asmem/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ppc"
+KEYWORDS="x86 ~sparc ppc ppc64"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/asmon/ChangeLog b/x11-plugins/asmon/ChangeLog
index 898aceaa683c..40103415fd6e 100644
--- a/x11-plugins/asmon/ChangeLog
+++ b/x11-plugins/asmon/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for x11-plugins/asmon
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/ChangeLog,v 1.1 2003/05/12 22:46:35 wwoods Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+*asmon-0.65 (20 Jun 2005)
+
+  20 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +asmon-0.65.ebuild:
+  Version bump.
+
+  13 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml (afterstep herd).
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> asmon-0.64.ebuild:
+  Stable on alpha.
+
+  09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> asmon-0.64.ebuild:
+  ~alpha keyword.
+
+  06 Nov 2004; <pyrania@gentoo.org> asmon-0.64.ebuild:
+  Marked stable on x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> asmon-0.64.ebuild:
+  Masked asmon-0.64.ebuild stable for ppc
+
+*asmon-0.64 (13 Jun 2004)
+
+  13 Jun 2004; <pyrania@gentoo.org> +asmon-0.64.ebuild:
+  Version bump. Closing bug #51879.
+
+  17 Mar 2004; Ciaran McCreesh <ciaranm@gentoo.org> asmon-0.62.ebuild:
+  Added ~sparc (#44975)
+
+  15 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> asmon-0.62.ebuild:
+  inherit eutils for epatch.
+
+  13 May 2003; Will Woods <wwoods@gentoo.org> asmon-0.62.ebuild:
+  Minor ebuild cleanups (thanks liquidx)
 
 *asmon-0.62 (12 May 2003)
 
diff --git a/x11-plugins/asmon/Manifest b/x11-plugins/asmon/Manifest
index e69de29bb2d1..484a8ef87237 100644
--- a/x11-plugins/asmon/Manifest
+++ b/x11-plugins/asmon/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cd37806f7a9a21e37d10ebbe44f27336 asmon-0.64.ebuild 709
+MD5 6314d31559f31e6f6c7eb30c933e1033 asmon-0.65.ebuild 710
+MD5 20b3f3d49e08dc97363eaf5497eb776d asmon-0.62.ebuild 749
+MD5 0fcad04ab1edbb9fc8424e6a81711f02 ChangeLog 1453
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+MD5 bf02e91d30bd8f286faac1484d86a30f files/asmon-cflags.diff 512
+MD5 7b0913a99b68877e50ea847c8242f12d files/asmon-alpha.diff 819
+MD5 2f3b3737e0b104f481cfd0cbd66f5ac3 files/digest-asmon-0.62 60
+MD5 18e342fd8a446660ae6583d7bbc6a8cd files/digest-asmon-0.64 61
+MD5 17bf096b394249c033722bdffc14c0c6 files/digest-asmon-0.65 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCtrSLEZCkKN40op4RAv7FAJ9P/LgATLxOeEuK7RD+idJr6lp48ACglumd
+HtVQHibGy6KDRVyXc3dSxTg=
+=pPEy
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/asmon/asmon-0.62.ebuild b/x11-plugins/asmon/asmon-0.62.ebuild
index c0a60cdc8679..daf9ae04c6ce 100644
--- a/x11-plugins/asmon/asmon-0.62.ebuild
+++ b/x11-plugins/asmon/asmon-0.62.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.62.ebuild,v 1.1 2003/05/12 22:46:35 wwoods Exp $
-# Short one-line description of this package.
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.62.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+inherit eutils
+
 DESCRIPTION="WindowMaker/AfterStep system monitor dockapp"
 HOMEPAGE="http://rio.vg/asmon/"
 SRC_URI="http://www.tigr.net/afterstep/download/asmon/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha"
+IUSE=""
+KEYWORDS="x86 alpha ~sparc ppc"
 DEPEND="virtual/x11"
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/asmon-cflags.diff
 	epatch ${FILESDIR}/asmon-alpha.diff
diff --git a/x11-plugins/asmon/asmon-0.64.ebuild b/x11-plugins/asmon/asmon-0.64.ebuild
index f110ede4c033..0d9335666794 100644
--- a/x11-plugins/asmon/asmon-0.64.ebuild
+++ b/x11-plugins/asmon/asmon-0.64.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.64.ebuild,v 1.1 2004/06/13 04:13:11 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.64.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.tigr.net/afterstep/download/asmon/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ppc alpha"
 DEPEND="virtual/x11"
 
 src_unpack() {
diff --git a/x11-plugins/asmon/asmon-0.65.ebuild b/x11-plugins/asmon/asmon-0.65.ebuild
index c38852bb3928..bb05af403c7c 100644
--- a/x11-plugins/asmon/asmon-0.65.ebuild
+++ b/x11-plugins/asmon/asmon-0.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.65.ebuild,v 1.1 2005/06/20 12:20:03 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.65.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 inherit eutils
 
diff --git a/x11-plugins/astime/ChangeLog b/x11-plugins/astime/ChangeLog
index dbed11643bb6..1b774f0f4c05 100644
--- a/x11-plugins/astime/ChangeLog
+++ b/x11-plugins/astime/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/astime
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/astime/ChangeLog,v 1.1 2003/06/17 00:03:17 spider Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/astime/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+  13 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
+  Added metadata.xml (afterstep herd).
+
+  31 Aug 2004; Tom Gall <tgall@gentoo.org> astime-2.8.ebuild:
+  stable on ppc64, bug #61763
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> astime-2.8.ebuild:
+  Add die following econf for bug 48950
+
+  06 Dec 2003; Heinrich Wendel <lanius@gentoo.org> astime-2.8.ebuild:
+  added ~amd64
 
 *astime-2.8 (15 May 2003)
 	
diff --git a/x11-plugins/astime/Manifest b/x11-plugins/astime/Manifest
index ade24dfd15eb..b58c33d5e455 100644
--- a/x11-plugins/astime/Manifest
+++ b/x11-plugins/astime/Manifest
@@ -1,4 +1,14 @@
-MD5 3bac2014cfcb01e495d2a0b97c4cb011 astime-2.8.ebuild 619
-MD5 1fa1197b38675aba057a43294988465f ChangeLog 407
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 266b9d9a9649ad5417f5550b5a583233 astime-2.8.ebuild 720
+MD5 9ac17155e1d2b7b2bc2338f3b02914bc ChangeLog 883
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
 MD5 f0fa39b40fbb62aee75a31e80dfd93c0 files/digest-astime-2.8 61
-MD5 e2389c77779ea25e2f5b62a3f1d6ae13 files/astime-2.8-gentoo.patch 813
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrYdDEZCkKN40op4RAgKrAKCDwbI2ldUo6dvi9SczCLvRhPRvKgCgwJwK
+lVVJWLPL3Pc8nLuMJYjHgNw=
+=MqQ6
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/astime/astime-2.8.ebuild b/x11-plugins/astime/astime-2.8.ebuild
index c8f853400663..c4d758519042 100644
--- a/x11-plugins/astime/astime-2.8.ebuild
+++ b/x11-plugins/astime/astime-2.8.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/astime/astime-2.8.ebuild,v 1.1 2003/06/17 00:03:17 spider Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/astime/astime-2.8.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Analogue clock utility for X Windows."
 HOMEPAGE="http://www.tigr.net/"
 SRC_URI="http://www.tigr.net/afterstep/download/astime/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc ppc64"
 IUSE="jpeg"
 
 DEPEND="virtual/x11
-        jpeg? ( media-libs/jpeg )"
+	jpeg? ( media-libs/jpeg )"
 
 src_compile() {
 	local myconf
 	use jpeg || myconf="--disable-jpeg"
 
-	econf $myconf
-	emake 
+	econf $myconf || die "econf failed"
+	emake
 }
 
 src_install () {
diff --git a/x11-plugins/autoprofile/ChangeLog b/x11-plugins/autoprofile/ChangeLog
index 06ce4a545407..e52dde95ad03 100644
--- a/x11-plugins/autoprofile/ChangeLog
+++ b/x11-plugins/autoprofile/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for x11-plugins/autoprofile
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/autoprofile/ChangeLog,v 1.1 2004/05/26 02:52:18 rizzo Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/autoprofile/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -autoprofile-2.07.ebuild,
+  -autoprofile-2.08.ebuild, -autoprofile-2.09.ebuild,
+  autoprofile-2.10.ebuild:
+  Stable on x86, pruning old versions
+
+*autoprofile-2.10 (23 Sep 2004)
+
+  23 Sep 2004; Don Seiler <rizzo@gentoo.org> +autoprofile-2.10.ebuild:
+  Version bump, works with 1.0.0
+
+*autoprofile-2.09 (13 Sep 2004)
+
+  13 Sep 2004; Don Seiler <rizzo@gentoo.org> +autoprofile-2.09.ebuild:
+  Version bump
+
+  03 Sep 2004; Don Seiler <rizzo@gentoo.org> autoprofile-2.08.ebuild:
+  Adding explicit emake call for Bug #62650
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  autoprofile-2.07.ebuild, autoprofile-2.08.ebuild:
+  Masked autoprofile-2.08.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  autoprofile-2.07.ebuild:
+  Masked autoprofile-2.07.ebuild stable for ppc
+
+*autoprofile-2.08 (01 Sep 2004)
+
+  01 Sep 2004; Don Seiler <rizzo@gentoo.org> +autoprofile-2.08.ebuild:
+  Version bump
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> autoprofile-2.07.ebuild:
+  Typo in DESCRIPTION: messanger -> messenger. Bug 59717.
+
+*autoprofile-2.07 (06 Jul 2004)
+
+  06 Jul 2004; Don Seiler <rizzo@gentoo.org> +autoprofile-2.07.ebuild:
+  Re-adding 2.07 since it works with 0.79.  Closes Bug #56257
+
+  29 Jun 2004; David Holm <dholm@gentoo.org> autoprofile-2.04.ebuild:
+  Added to ~ppc again, why was it removed?
+
+  28 Jun 2004; Don Seiler <rizzo@gentoo.org> -autoprofile-2.07.ebuild:
+  Removing old files for gaim pruning
+
+  15 Jun 2004; Don Seiler <rizzo@gentoo.org> -autoprofile-2.06.ebuild:
+  Pruning obsolete files
+
+*autoprofile-2.07 (15 Jun 2004)
+
+  15 Jun 2004; Don Seiler <rizzo@gentoo.org> +autoprofile-2.07.ebuild:
+  Version bump
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> autoprofile-2.06.ebuild:
+  Added to ~ppc.
+
+*autoprofile-2.06 (31 May 2004)
+
+  31 May 2004; Don Seiler <rizzo@gentoo.org>; +autoprofile-2.06.ebuild:
+  Version bump: 2.06 only works with gaim-0.78
 
 *autoprofile-2.04 (25 May 2004)
 
diff --git a/x11-plugins/autoprofile/Manifest b/x11-plugins/autoprofile/Manifest
index 3e89c3477d5d..ee6e343b8dd2 100644
--- a/x11-plugins/autoprofile/Manifest
+++ b/x11-plugins/autoprofile/Manifest
@@ -1,2 +1,4 @@
-MD5 82d29c8a48d0bbb4fa3461d124b0357f autoprofile-2.04.ebuild 962
-MD5 6234e853a543f41c5cbe981bcc3747c2 files/digest-autoprofile-2.04 67
+MD5 786175ea2cf0504e823130f8a5ea1d7c ChangeLog 2380
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+MD5 de5a11ebca6897a0689cbd6a0ca04e1d autoprofile-2.10.ebuild 706
+MD5 9f9da3e76cfe1523d4a7af98bf241abd files/digest-autoprofile-2.10 67
diff --git a/x11-plugins/autoprofile/autoprofile-2.10.ebuild b/x11-plugins/autoprofile/autoprofile-2.10.ebuild
index 3e10dfa0666f..26714957c13c 100644
--- a/x11-plugins/autoprofile/autoprofile-2.10.ebuild
+++ b/x11-plugins/autoprofile/autoprofile-2.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/autoprofile/autoprofile-2.10.ebuild,v 1.1 2004/09/23 14:27:33 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/autoprofile/autoprofile-2.10.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 DESCRIPTION="AutoProfile is a fully-featured profile manager for the popular instant messenger client Gaim."
 HOMEPAGE="http://hkn.eecs.berkeley.edu/~casey/autoprofile/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 DEPEND=">=net-im/gaim-1.0.0"
 
diff --git a/x11-plugins/autoprofile/metadata.xml b/x11-plugins/autoprofile/metadata.xml
index e81d825904df..3e2b4181f5be 100644
--- a/x11-plugins/autoprofile/metadata.xml
+++ b/x11-plugins/autoprofile/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-  <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/bangexec/ChangeLog b/x11-plugins/bangexec/ChangeLog
index 717bf013ba22..cc4ffbc65008 100644
--- a/x11-plugins/bangexec/ChangeLog
+++ b/x11-plugins/bangexec/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-plugins/bangexec
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bangexec/ChangeLog,v 1.1 2005/04/03 20:53:55 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bangexec/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  17 Oct 2005; <gothgirl@gentoo.org> -bangexec-1.1.4.ebuild,
+  -bangexec-1.3.0.ebuild, bangexec-1.3.0.2.ebuild:
+  Updated Homepage and SRC_URI
+
+*bangexec-1.3.0.2 (21 Jun 2005)
+
+  21 Jun 2005; Jory A. Pratt <anarchy@gentoo.org> +bangexec-1.3.0.2.ebuild:
+  revision bump
+
+*bangexec-1.3.0 (21 Apr 2005)
+
+  21 Apr 2005; <anarchy@gentoo.org> +bangexec-1.3.0.ebuild:
+  new upstream
 
 *bangexec-1.1.4 (03 Apr 2005)
 
diff --git a/x11-plugins/bangexec/Manifest b/x11-plugins/bangexec/Manifest
index 0305907e2abb..b37d306e96b1 100644
--- a/x11-plugins/bangexec/Manifest
+++ b/x11-plugins/bangexec/Manifest
@@ -1,3 +1,4 @@
-MD5 d6dc8fbd76561b0c77d3275930509509 bangexec-1.1.4.ebuild 473
-MD5 f3ac51b409a63ff934b15f3933abe667 metadata.xml 330
-MD5 59b4546351bd63b971a748fbc2e2d4b7 files/digest-bangexec-1.1.4 67
+MD5 114f8e2fd9d88066bedfac26f4b6239d ChangeLog 788
+MD5 395a0ef0e3dbd23b3f082c47769dd4ff bangexec-1.3.0.2.ebuild 767
+MD5 ccb652f4ad08f18b75286a0c93f63e73 files/digest-bangexec-1.3.0.2 69
+MD5 6e02fad382bd1a9b6254edec6fa160aa metadata.xml 328
diff --git a/x11-plugins/bangexec/bangexec-1.3.0.2.ebuild b/x11-plugins/bangexec/bangexec-1.3.0.2.ebuild
index cabb53c54649..c8c06e32623a 100644
--- a/x11-plugins/bangexec/bangexec-1.3.0.2.ebuild
+++ b/x11-plugins/bangexec/bangexec-1.3.0.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bangexec/bangexec-1.3.0.2.ebuild,v 1.1 2005/06/21 02:23:49 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bangexec/bangexec-1.3.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="GAIM Shell OutPut Plugin"
-HOMEPAGE="http://bard.sytes.net/bangexec/"
-SRC_URI="http://bard.sytes.net/bangexec/${P}.tar.bz2"
+HOMEPAGE="http://ignorance.sourceforge.net/bangexec"
+SRC_URI="mirror:sourceforge/ignorance/bangexec/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,10 +19,10 @@ src_unpack() {
 	unpack ${A}
 	# Set correct plugindir
 	sed -i -e "s:^\(plugindir = \$(prefix)/\)lib/:\1$(get_libdir)/:" \
-		${S}/Makefile.in || die "sed failed"
+		"${S}"/Makefile.in || die "sed failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "Install failed"
+	make install DESTDIR="${D}" || die "Install failed"
 	dodoc ChangeLog INSTALL README AUTHORS
 }
diff --git a/x11-plugins/bangexec/metadata.xml b/x11-plugins/bangexec/metadata.xml
index 93a0ad0b546f..3574de369f55 100644
--- a/x11-plugins/bangexec/metadata.xml
+++ b/x11-plugins/bangexec/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>net-im</herd>
 <maintainer>
-    <email>gaim-bugs@gentoo.org</email>
+    <email>anarchy@gentoo.org</email>
 </maintainer>
 <longdescription>
 Bangexec is a simple way of executing shell commands through gaim.
diff --git a/x11-plugins/bfm/ChangeLog b/x11-plugins/bfm/ChangeLog
index c552b1370b2e..4ecf2b83de7f 100644
--- a/x11-plugins/bfm/ChangeLog
+++ b/x11-plugins/bfm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/bfm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/ChangeLog,v 1.1 2004/11/12 23:46:51 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  21 Jul 2005; David Holm <dholm@gentoo.org> bfm-0.6.4.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> bfm-0.6.4.ebuild:
+  Stable for x86. Fix copyright headers.
 
 *bfm-0.6.4 (13 Nov 2004)
 
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index e1c68dc0d1f5..6e2d87c7de90 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,3 +1,5 @@
-MD5 3740a8eb7ac0cf9c6528f57b4a2de799 bfm-0.6.4.ebuild 738
+MD5 bfe8814b6ee74e5d00328d0ecd4fd0ff ChangeLog 558
+MD5 1e58a1202295115a93f5c1667349df07 bfm-0.6.4.ebuild 857
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 982d3f2f02d699a46ef33cb67ebaa862 files/bfm-0.6.4-Makefile.patch 295
 MD5 03c246d1fb0b4f65ef0247f8a5c2c6c4 files/digest-bfm-0.6.4 61
diff --git a/x11-plugins/bfm/bfm-0.6.4.ebuild b/x11-plugins/bfm/bfm-0.6.4.ebuild
index f403657111dc..b599615b2987 100644
--- a/x11-plugins/bfm/bfm-0.6.4.ebuild
+++ b/x11-plugins/bfm/bfm-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/bfm-0.6.4.ebuild,v 1.1 2004/11/12 23:46:51 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/bfm-0.6.4.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.jnrowe.ukfsn.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 
 DEPEND=">=x11-libs/gtk+-2.4.9-r1"
 
diff --git a/x11-plugins/cputnik/ChangeLog b/x11-plugins/cputnik/ChangeLog
index 9ed20c308d80..1e9ac42b4ffc 100644
--- a/x11-plugins/cputnik/ChangeLog
+++ b/x11-plugins/cputnik/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for x11-plugins/cputnik
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.1 2004/07/08 13:12:40 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+  12 Jun 2005; Joseph Jezak <josejx@gentoo.org> cputnik-0.1.1.ebuild:
+  Marked ~ppc for bug #95345.  Tested by nixnut.
 
 *cputnik-0.1.1 (08 Jul 2004)
 
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> cputnik-0.1.1.ebuild:
+  Stable on x86.
+
   08 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> cputnik-0.1.1.ebuild:
   Initial import.
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index ca6f4ba1fb69..9bfb4746a0b5 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,4 +1,14 @@
-MD5 c938d32dc7ef54e6933facb6d0c8b7df ChangeLog 328
-MD5 a6bb65fb883aa8323b6bfd6287e3f062 metadata.xml 528
-MD5 1c6d875880b64f779d6b2368cc2839a4 cputnik-0.1.1.ebuild 663
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e0f2205eb2299c01660a6bb488c1b430 ChangeLog 545
+MD5 ffb09e4ca5b8b08513b22384e9c33b2f cputnik-0.1.1.ebuild 608
 MD5 c055003f9162d5332e37901e45ca1d70 files/digest-cputnik-0.1.1 64
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1vBMI1lqEGTUzyQRAkgRAJ9JydD+B6jFUSIE0I1HTm+YdDd4IwCeLriR
+IBoaY+vNfav5CUK4UWVknyQ=
+=pRew
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/cputnik/cputnik-0.1.1.ebuild b/x11-plugins/cputnik/cputnik-0.1.1.ebuild
index f1d1ae44b6f6..37c18e31ca11 100644
--- a/x11-plugins/cputnik/cputnik-0.1.1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.1.1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/cputnik-0.1.1.ebuild,v 1.1 2004/07/08 13:12:40 s4t4n Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/cputnik-0.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +10,7 @@ SRC_URI="http://clay.ll.pl/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/desklet-clock/ChangeLog b/x11-plugins/desklet-clock/ChangeLog
index e58e1811aa7f..cc58b780a84c 100644
--- a/x11-plugins/desklet-clock/ChangeLog
+++ b/x11-plugins/desklet-clock/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for x11-plugins/desklet-clock
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/ChangeLog,v 1.1 2003/09/09 05:12:03 obz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  desklet-clock-0.32-r1.ebuild:
+  Mark 0.32-r1 stable on alpha
+
+*desklet-clock-0.50 (06 Jun 2005)
+
+  06 Jun 2005; Joe Sapp <nixphoeni@gentoo.org> +desklet-clock-0.50.ebuild:
+  Version bump
+
+  09 May 2005; David Holm <dholm@gentoo.org> desklet-clock-0.40.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+*desklet-clock-0.40 (21 Apr 2005)
+
+  21 Apr 2005; Joe Sapp <nixphoeni@gentoo.org> +desklet-clock-0.40.ebuild:
+  Adding support for the eclass and bumping the version
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  desklet-clock-0.31.ebuild, desklet-clock-0.32-r1.ebuild,
+  desklet-clock-0.32.ebuild:
+  Masked desklet-clock-0.32.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  desklet-clock-0.31.ebuild, desklet-clock-0.32-r1.ebuild:
+  Masked desklet-clock-0.32-r1.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  desklet-clock-0.31.ebuild:
+  Masked desklet-clock-0.31.ebuild stable for ppc
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> desklet-clock-0.32-r1.ebuild:
+  Mark stable on amd64.
+
+  04 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  desklet-clock-0.32-r1.ebuild:
+  Add ~alpha for bug 46601
+
+*desklet-clock-0.32-r1 (12 Nov 2003)
+
+  12 Nov 2003; Mike Gardiner <obz@gentoo.org> desklet-clock-0.32-r1.ebuild:
+  Fixed up permissions for the Sensor, see bug #32907
+
+  01 Nov 2003; Luca Barbato <lu_zero@gentoo.org> desklet-clock-0.31.ebuild,
+  desklet-clock-0.32.ebuild:
+  Marked ~ppc
+
+  24 Sep 2003; Todd Sunderlin <todd@gentoo.org> desklet-clock-0.32.ebuild:
+  added ~sparc keyword
+
+*desklet-clock-0.32 (14 Sep 2003)
+
+  14 Sep 2003; Mike Gardiner <obz@gentoo.org> desklet-clock-0.32.ebuild:
+  New version, bug fix release
 
 *desklet-clock-0.31 (09 Sep 2003)
 
diff --git a/x11-plugins/desklet-clock/Manifest b/x11-plugins/desklet-clock/Manifest
index 5592602ebe5c..8a485f805c71 100644
--- a/x11-plugins/desklet-clock/Manifest
+++ b/x11-plugins/desklet-clock/Manifest
@@ -1,2 +1,12 @@
-MD5 8f924b9aa173a1fb462fd538e20a69e6 desklet-clock-0.31.ebuild 917
+MD5 61b514eb7ae6b6b3af48824e98d69c7a desklet-clock-0.31.ebuild 1085
+MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
+MD5 be48b2c6879617a24e33b6bc28f3e4f2 desklet-clock-0.32-r1.ebuild 1227
+MD5 d9e4c5f8828c93da968a068224e667d4 ChangeLog 2181
+MD5 cbaeed43598e2110990a4362a73a4682 desklet-clock-0.32.ebuild 1092
+MD5 6d1ab3b956c6b23635c7d3e03c5d012e desklet-clock-0.40.ebuild 664
+MD5 5096efa9447dd541a670611763720275 desklet-clock-0.50.ebuild 680
+MD5 093c33f89910f51e4696c9cc9ed03901 files/digest-desklet-clock-0.32 71
+MD5 3ea2aac5596dbc13e63928ee6ba46738 files/digest-desklet-clock-0.40 70
+MD5 093c33f89910f51e4696c9cc9ed03901 files/digest-desklet-clock-0.32-r1 71
 MD5 5d9158812e523c5765f013a933fddfdf files/digest-desklet-clock-0.31 71
+MD5 33e35258c1cb215369ff9371d77d8367 files/digest-desklet-clock-0.50 70
diff --git a/x11-plugins/desklet-clock/desklet-clock-0.31.ebuild b/x11-plugins/desklet-clock/desklet-clock-0.31.ebuild
index 44036a0cc115..0ea2758684c0 100644
--- a/x11-plugins/desklet-clock/desklet-clock-0.31.ebuild
+++ b/x11-plugins/desklet-clock/desklet-clock-0.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.31.ebuild,v 1.1 2003/09/09 05:12:03 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.31.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 DESKLET_NAME="Clock"
 
@@ -10,12 +10,12 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="The clock sensors and displays for gdesklets"
 SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.pycage.de/"
+HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=12"
 LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 
 DEPEND=">=gnome-extra/gdesklets-core-0.20"
 
diff --git a/x11-plugins/desklet-clock/desklet-clock-0.32-r1.ebuild b/x11-plugins/desklet-clock/desklet-clock-0.32-r1.ebuild
index 5aaef8088d4c..00b30e958d2d 100644
--- a/x11-plugins/desklet-clock/desklet-clock-0.32-r1.ebuild
+++ b/x11-plugins/desklet-clock/desklet-clock-0.32-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.32-r1.ebuild,v 1.1 2003/11/12 10:03:55 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.32-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 DESKLET_NAME="Clock"
 
@@ -10,12 +10,12 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="The clock sensors and displays for gdesklets"
 SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.pycage.de/"
+HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=12"
 LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="alpha amd64 ppc ~sparc ~x86"
 
 DEPEND=">=gnome-extra/gdesklets-core-0.20"
 
diff --git a/x11-plugins/desklet-clock/desklet-clock-0.32.ebuild b/x11-plugins/desklet-clock/desklet-clock-0.32.ebuild
index 10171f97a4a1..9873e5302ecc 100644
--- a/x11-plugins/desklet-clock/desklet-clock-0.32.ebuild
+++ b/x11-plugins/desklet-clock/desklet-clock-0.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.32.ebuild,v 1.1 2003/09/14 10:09:28 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.32.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 DESKLET_NAME="Clock"
 
@@ -10,12 +10,12 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="The clock sensors and displays for gdesklets"
 SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.pycage.de/"
+HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=12"
 LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc ppc"
 
 DEPEND=">=gnome-extra/gdesklets-core-0.20"
 
diff --git a/x11-plugins/desklet-clock/desklet-clock-0.40.ebuild b/x11-plugins/desklet-clock/desklet-clock-0.40.ebuild
index aa331d60ccc1..9a245efabc70 100644
--- a/x11-plugins/desklet-clock/desklet-clock-0.40.ebuild
+++ b/x11-plugins/desklet-clock/desklet-clock-0.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.40.ebuild,v 1.1 2005/04/21 20:26:24 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.40.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 inherit gdesklets
 
@@ -15,7 +15,7 @@ SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-clock/desklet-clock-0.50.ebuild b/x11-plugins/desklet-clock/desklet-clock-0.50.ebuild
index b994bbd83c5c..c5f4d16bfd4f 100644
--- a/x11-plugins/desklet-clock/desklet-clock-0.50.ebuild
+++ b/x11-plugins/desklet-clock/desklet-clock-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.50.ebuild,v 1.1 2005/06/06 02:44:29 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-clock/desklet-clock-0.50.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 inherit gdesklets
 
diff --git a/x11-plugins/desklet-discreetclock/ChangeLog b/x11-plugins/desklet-discreetclock/ChangeLog
index fd6a50df51b8..4f8f08c25179 100644
--- a/x11-plugins/desklet-discreetclock/ChangeLog
+++ b/x11-plugins/desklet-discreetclock/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/desklet-discreetclock
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-discreetclock/ChangeLog,v 1.1 2005/07/31 01:17:08 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-discreetclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  21 Sep 2005; Homer Parker <hparker@gentoo.org>
+  desklet-discreetclock-0.3.ebuild:
+  Marked ~amd64.
+
+  31 Jul 2005; David Holm <dholm@gentoo.org>
+  desklet-discreetclock-0.3.ebuild:
+  Added to ~ppc.
 
 *desklet-discreetclock-0.3 (31 Jul 2005)
 
diff --git a/x11-plugins/desklet-discreetclock/Manifest b/x11-plugins/desklet-discreetclock/Manifest
index 6f6a9c5fd2da..d8a840418b35 100644
--- a/x11-plugins/desklet-discreetclock/Manifest
+++ b/x11-plugins/desklet-discreetclock/Manifest
@@ -1,3 +1,4 @@
-MD5 fda6070cab2e5bd4da0d73e5891565d1 desklet-discreetclock-0.3.ebuild 549
+MD5 004f8bb0d2fab34ba85e5dfc0a9697f3 ChangeLog 601
+MD5 6c5b5365078c4ee816382caab8ee7786 desklet-discreetclock-0.3.ebuild 690
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 164670ef32ab20f19e5a3a3f0bdcde8e files/digest-desklet-discreetclock-0.3 67
diff --git a/x11-plugins/desklet-discreetclock/desklet-discreetclock-0.3.ebuild b/x11-plugins/desklet-discreetclock/desklet-discreetclock-0.3.ebuild
index 2a498abda6af..a84856b8820d 100644
--- a/x11-plugins/desklet-discreetclock/desklet-discreetclock-0.3.ebuild
+++ b/x11-plugins/desklet-discreetclock/desklet-discreetclock-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-discreetclock/desklet-discreetclock-0.3.ebuild,v 1.1 2005/07/31 01:17:08 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-discreetclock/desklet-discreetclock-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,6 +16,6 @@ LICENSE="freedist"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-ftb/ChangeLog b/x11-plugins/desklet-ftb/ChangeLog
index 2ec1df8c11a9..c20570a947fd 100644
--- a/x11-plugins/desklet-ftb/ChangeLog
+++ b/x11-plugins/desklet-ftb/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/desklet-ftb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/ChangeLog,v 1.1 2005/07/30 18:32:18 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+  21 Sep 2005; Homer Parker <hparker@gentoo.org> desklet-ftb-0.3.1.ebuild:
+  Marked ~amd64.
+
+*desklet-ftb-0.3.1 (30 Aug 2005)
+
+  30 Aug 2005; Joe Sapp <nixphoeni@gentoo.org> +desklet-ftb-0.3.1.ebuild:
+  Version bump, added a hack to adjust the downloaded filename to use a comma
+  for the build version (1)
+
+  31 Jul 2005; David Holm <dholm@gentoo.org> desklet-ftb-0.3.ebuild:
+  Added to ~ppc.
 
 *desklet-ftb-0.3 (30 Jul 2005)
 
diff --git a/x11-plugins/desklet-ftb/Manifest b/x11-plugins/desklet-ftb/Manifest
index 6c65dfe4d50c..b6c69ccbb536 100644
--- a/x11-plugins/desklet-ftb/Manifest
+++ b/x11-plugins/desklet-ftb/Manifest
@@ -1,3 +1,6 @@
-MD5 2430de613257100b9b74e68d2bfa79c2 desklet-ftb-0.3.ebuild 535
+MD5 84a8bf408b520d2d27c14c4e34ce5824 ChangeLog 754
+MD5 10bd33b6bfe62e3b66e40300df2567f9 desklet-ftb-0.3.1.ebuild 721
+MD5 b4786ab8d495aaf452715c85b80458d4 desklet-ftb-0.3.ebuild 647
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 7ed9f5fd620ca68d346945cb7dc73a43 files/digest-desklet-ftb-0.3 58
+MD5 0d77fafa69e204722d6a0003f6de6a2e files/digest-desklet-ftb-0.3.1 60
diff --git a/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild b/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild
index 3d72984f0cd2..7498659cd5ff 100644
--- a/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild
+++ b/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild,v 1.1 2005/08/30 20:44:11 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,6 +16,6 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild b/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild
index 36d9588d0474..da4650eeb6bd 100644
--- a/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild
+++ b/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild,v 1.1 2005/07/30 18:32:18 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,6 +16,6 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-hypertail/ChangeLog b/x11-plugins/desklet-hypertail/ChangeLog
index 3c22e4f9e25b..59b1dba1b895 100644
--- a/x11-plugins/desklet-hypertail/ChangeLog
+++ b/x11-plugins/desklet-hypertail/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-plugins/desklet-hypertail
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-hypertail/ChangeLog,v 1.1 2005/04/23 05:26:33 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-hypertail/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  31 Jul 2005; Joe Sapp <nixphoeni@gentoo.org>
+  desklet-hypertail-2.01-r1.ebuild:
+  Stable on x86
+
+  09 May 2005; David Holm <dholm@gentoo.org>
+  desklet-hypertail-2.01-r1.ebuild:
+  Added to ~ppc.
+
+  28 Apr 2005; Joe Sapp <nixphoeni@gentoo.org>
+  -desklet-hypertail-2.01.ebuild:
+  Removing since RDEPEND didn't have the necessary entry
+
+*desklet-hypertail-2.01-r1 (28 Apr 2005)
+
+  28 Apr 2005; Joe Sapp <nixphoeni@gentoo.org>
+  +desklet-hypertail-2.01-r1.ebuild:
+  Added desklet-regexp to RDEPEND
 
 *desklet-hypertail-2.01 (23 Apr 2005)
 
diff --git a/x11-plugins/desklet-hypertail/Manifest b/x11-plugins/desklet-hypertail/Manifest
index c2acde13ea61..6959e856c346 100644
--- a/x11-plugins/desklet-hypertail/Manifest
+++ b/x11-plugins/desklet-hypertail/Manifest
@@ -1,3 +1,4 @@
-MD5 f26f4718c39a53aecd4848fac09d69c0 desklet-hypertail-2.01.ebuild 559
+MD5 843f2cda7b000b2031f57402c31d59cb desklet-hypertail-2.01-r1.ebuild 725
+MD5 dd88e54b08bc27f7061c335ff6dae166 ChangeLog 886
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
-MD5 b5c9a31f656c3ac5d4301d2faa0a2ba1 files/digest-desklet-hypertail-2.01 66
+MD5 b5c9a31f656c3ac5d4301d2faa0a2ba1 files/digest-desklet-hypertail-2.01-r1 66
diff --git a/x11-plugins/desklet-hypertail/desklet-hypertail-2.01-r1.ebuild b/x11-plugins/desklet-hypertail/desklet-hypertail-2.01-r1.ebuild
index b2feee4fc8ae..16ef4313fbbe 100644
--- a/x11-plugins/desklet-hypertail/desklet-hypertail-2.01-r1.ebuild
+++ b/x11-plugins/desklet-hypertail/desklet-hypertail-2.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-hypertail/desklet-hypertail-2.01-r1.ebuild,v 1.1 2005/04/28 04:30:57 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-hypertail/desklet-hypertail-2.01-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
 inherit gdesklets
 
@@ -14,7 +14,7 @@ SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_PN}-${PV}.tar.gz"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3
diff --git a/x11-plugins/desklet-justanicon/ChangeLog b/x11-plugins/desklet-justanicon/ChangeLog
index 2badf2258c1b..78703bb27534 100644
--- a/x11-plugins/desklet-justanicon/ChangeLog
+++ b/x11-plugins/desklet-justanicon/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-plugins/desklet-justanicon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-justanicon/ChangeLog,v 1.1 2005/08/30 20:04:57 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-justanicon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 *desklet-justanicon-0.2 (30 Aug 2005)
 
diff --git a/x11-plugins/desklet-justanicon/Manifest b/x11-plugins/desklet-justanicon/Manifest
index a86dd9084d13..9012209546eb 100644
--- a/x11-plugins/desklet-justanicon/Manifest
+++ b/x11-plugins/desklet-justanicon/Manifest
@@ -1,3 +1,4 @@
-MD5 837642b5b79d6f5dee09f97bcc2d96de desklet-justanicon-0.2.ebuild 530
+MD5 042ff1cfdf387c1c9036d9d1bb94229c desklet-justanicon-0.2.ebuild 655
+MD5 466a95ec2b0daee4fc586c9cc18cbf40 ChangeLog 389
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 41c9bc11f0d59a2bd978c73c6bb09268 files/digest-desklet-justanicon-0.2 65
diff --git a/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild b/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild
index f8e013476b8b..a96a868d6a47 100644
--- a/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild
+++ b/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild,v 1.1 2005/08/30 20:04:57 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-justanicon/desklet-justanicon-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 inherit gdesklets
 
diff --git a/x11-plugins/desklet-newsgrab/ChangeLog b/x11-plugins/desklet-newsgrab/ChangeLog
index 803dd00035fa..4d63e47cb431 100644
--- a/x11-plugins/desklet-newsgrab/ChangeLog
+++ b/x11-plugins/desklet-newsgrab/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/desklet-newsgrab
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-newsgrab/ChangeLog,v 1.1 2005/04/23 04:39:13 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-newsgrab/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  09 May 2005; David Holm <dholm@gentoo.org> desklet-newsgrab-1.5.ebuild:
+  Added to ~ppc.
 
 *desklet-newsgrab-1.5 (23 Apr 2005)
 
diff --git a/x11-plugins/desklet-newsgrab/Manifest b/x11-plugins/desklet-newsgrab/Manifest
index 07ecfa54104a..6bf9af3af382 100644
--- a/x11-plugins/desklet-newsgrab/Manifest
+++ b/x11-plugins/desklet-newsgrab/Manifest
@@ -1,3 +1,4 @@
-MD5 ccc371f87e0511d852a38b2026ae1fec desklet-newsgrab-1.5.ebuild 605
+MD5 dc0b8fc67bb76a237592f6ed94a7e898 ChangeLog 469
+MD5 d5b8c05a4f3df48f55d0c78d03fca907 desklet-newsgrab-1.5.ebuild 736
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 76dc1b6e57a54019763fc7be49770292 files/digest-desklet-newsgrab-1.5 63
diff --git a/x11-plugins/desklet-newsgrab/desklet-newsgrab-1.5.ebuild b/x11-plugins/desklet-newsgrab/desklet-newsgrab-1.5.ebuild
index 91b74ed2a8bb..0521b237534f 100644
--- a/x11-plugins/desklet-newsgrab/desklet-newsgrab-1.5.ebuild
+++ b/x11-plugins/desklet-newsgrab/desklet-newsgrab-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-newsgrab/desklet-newsgrab-1.5.ebuild,v 1.1 2005/04/23 04:39:13 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-newsgrab/desklet-newsgrab-1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 inherit gdesklets
 
@@ -15,6 +15,6 @@ LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-regexp/ChangeLog b/x11-plugins/desklet-regexp/ChangeLog
index 801fee8cb139..1dd7e41d5ab2 100644
--- a/x11-plugins/desklet-regexp/ChangeLog
+++ b/x11-plugins/desklet-regexp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/desklet-regexp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-regexp/ChangeLog,v 1.1 2005/04/23 05:14:02 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-regexp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+  21 Sep 2005; Homer Parker <hparker@gentoo.org> desklet-regexp-1.0.ebuild:
+  Marked ~amd64.
+
+  31 Jul 2005; Joe Sapp <nixphoeni@gentoo.org> desklet-regexp-1.0.ebuild:
+  Stable on x86
+
+  09 May 2005; David Holm <dholm@gentoo.org> desklet-regexp-1.0.ebuild:
+  Added to ~ppc.
 
 *desklet-regexp-1.0 (23 Apr 2005)
 
diff --git a/x11-plugins/desklet-regexp/Manifest b/x11-plugins/desklet-regexp/Manifest
index d465486953f8..b532c8a21314 100644
--- a/x11-plugins/desklet-regexp/Manifest
+++ b/x11-plugins/desklet-regexp/Manifest
@@ -1,3 +1,4 @@
-MD5 576866fe9041db84d8f17f5748c6dcca desklet-regexp-1.0.ebuild 506
+MD5 332a48dd7361cf11ada34b6fd9d3623f ChangeLog 646
+MD5 f990f8fcc528405f14022ee1af7c7abe desklet-regexp-1.0.ebuild 619
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 f2c966a056814491e220a5d16f4fbfcd files/digest-desklet-regexp-1.0 63
diff --git a/x11-plugins/desklet-regexp/desklet-regexp-1.0.ebuild b/x11-plugins/desklet-regexp/desklet-regexp-1.0.ebuild
index 3a33a243316d..e222c21c7720 100644
--- a/x11-plugins/desklet-regexp/desklet-regexp-1.0.ebuild
+++ b/x11-plugins/desklet-regexp/desklet-regexp-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-regexp/desklet-regexp-1.0.ebuild,v 1.1 2005/04/23 05:14:02 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-regexp/desklet-regexp-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 inherit gdesklets
 
@@ -14,7 +14,7 @@ SRC_URI="http://gdesklets.gnomedesktop.org/files/${DESKLET_NAME}.tar.gz"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 LICENSE="GPL-2"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-rssgrab/ChangeLog b/x11-plugins/desklet-rssgrab/ChangeLog
index 014fc59a143e..addf59b5c052 100644
--- a/x11-plugins/desklet-rssgrab/ChangeLog
+++ b/x11-plugins/desklet-rssgrab/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-plugins/desklet-rssgrab
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rssgrab/ChangeLog,v 1.1 2004/07/18 04:16:25 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rssgrab/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  07 Sep 2004; Tom Martin <slarti@gentoo.org> desklet-rssgrab-0.6.2.ebuild:
+  Marked ~amd64, resolving bug 59474. Thanks to Michael Cohen <mjc@gentoo.org>.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  desklet-rssgrab-0.6.2.ebuild:
+  Masked desklet-rssgrab-0.6.2.ebuild stable for ppc
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> desklet-rssgrab-0.6.2.ebuild:
+  Added to ~ppc.
 
 *desklet-rssgrab-0.6.2 (18 Jul 2004)
 
diff --git a/x11-plugins/desklet-rssgrab/Manifest b/x11-plugins/desklet-rssgrab/Manifest
index bb990d51056c..b4ca4ef74b58 100644
--- a/x11-plugins/desklet-rssgrab/Manifest
+++ b/x11-plugins/desklet-rssgrab/Manifest
@@ -1,2 +1,4 @@
-MD5 b3c5ddd20079ce2bed66507536688e0a desklet-rssgrab-0.6.2.ebuild 1140
+MD5 1457714c55ceda294993531b912c0e12 desklet-rssgrab-0.6.2.ebuild 1268
+MD5 99874d9a5407bee9ddff183cb1a986a0 ChangeLog 809
+MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
 MD5 bfbd6d86fc536180c925b65ebd5ca53a files/digest-desklet-rssgrab-0.6.2 65
diff --git a/x11-plugins/desklet-rssgrab/desklet-rssgrab-0.6.2.ebuild b/x11-plugins/desklet-rssgrab/desklet-rssgrab-0.6.2.ebuild
index 4c992a3e54ca..67059c27090e 100644
--- a/x11-plugins/desklet-rssgrab/desklet-rssgrab-0.6.2.ebuild
+++ b/x11-plugins/desklet-rssgrab/desklet-rssgrab-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rssgrab/desklet-rssgrab-0.6.2.ebuild,v 1.1 2004/07/18 04:16:25 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rssgrab/desklet-rssgrab-0.6.2.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 DESKLET_NAME="rssgrab"
 
@@ -15,7 +15,7 @@ LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc ~amd64"
 
 DEPEND=">=gnome-extra/gdesklets-core-0.26"
 
@@ -40,7 +40,7 @@ src_install() {
 	dodoc ${DOCS}
 
 	# the desklets unpack preserves permissions of the archive
-	chown -R root:root ${D}${SYS_PATH}/Sensors/${DESKLET_NAME}
+	chown -R root:0 ${D}${SYS_PATH}/Sensors/${DESKLET_NAME}
 
 }
 
diff --git a/x11-plugins/desklet-rsstickerbar/ChangeLog b/x11-plugins/desklet-rsstickerbar/ChangeLog
index 98652fe2cae2..c4a9c7979800 100644
--- a/x11-plugins/desklet-rsstickerbar/ChangeLog
+++ b/x11-plugins/desklet-rsstickerbar/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-plugins/desklet-rsstickerbar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rsstickerbar/ChangeLog,v 1.1 2005/05/27 11:48:06 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rsstickerbar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 *desklet-rsstickerbar-0.12 (27 May 2005)
 
diff --git a/x11-plugins/desklet-rsstickerbar/Manifest b/x11-plugins/desklet-rsstickerbar/Manifest
index de215e997c95..a1bd5218c14a 100644
--- a/x11-plugins/desklet-rsstickerbar/Manifest
+++ b/x11-plugins/desklet-rsstickerbar/Manifest
@@ -1,3 +1,4 @@
-MD5 a1d99f4b2a8490bb07601378aab5752f desklet-rsstickerbar-0.12.ebuild 532
+MD5 2f78e954ab22a231f78bfc03a426cf30 desklet-rsstickerbar-0.12.ebuild 662
+MD5 4dd932867b98387be3506dd459972a3f ChangeLog 399
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 6dc064a3779fd6f9704a7fe621c21a97 files/digest-desklet-rsstickerbar-0.12 60
diff --git a/x11-plugins/desklet-rsstickerbar/desklet-rsstickerbar-0.12.ebuild b/x11-plugins/desklet-rsstickerbar/desklet-rsstickerbar-0.12.ebuild
index 1c769ec14607..13836289c8e0 100644
--- a/x11-plugins/desklet-rsstickerbar/desklet-rsstickerbar-0.12.ebuild
+++ b/x11-plugins/desklet-rsstickerbar/desklet-rsstickerbar-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rsstickerbar/desklet-rsstickerbar-0.12.ebuild,v 1.1 2005/05/27 11:48:06 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-rsstickerbar/desklet-rsstickerbar-0.12.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 inherit gdesklets
 
diff --git a/x11-plugins/desklet-scweather/ChangeLog b/x11-plugins/desklet-scweather/ChangeLog
index ee1784c1e82f..61f7de45b32f 100644
--- a/x11-plugins/desklet-scweather/ChangeLog
+++ b/x11-plugins/desklet-scweather/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for x11-plugins/desklet-scweather
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/ChangeLog,v 1.1 2005/05/26 03:00:40 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  21 Sep 2005; Homer Parker <hparker@gentoo.org>
+  desklet-scweather-0.4.ebuild:
+  Marked ~amd64.
+
+*desklet-scweather-0.4 (30 Aug 2005)
+
+  30 Aug 2005; Joe Sapp <nixphoeni@gentoo.org>
+  +desklet-scweather-0.4.ebuild:
+  Version bump
+
+  29 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  desklet-scweather-0.3.ebuild:
+  ~sparc it up baby
+
+  27 Jun 2005; David Holm <dholm@gentoo.org> desklet-scweather-0.3.ebuild:
+  Added to ~ppc.
+
+*desklet-scweather-0.3 (08 Jun 2005)
+
+  08 Jun 2005; Joe Sapp <nixphoeni@gentoo.org>
+  +desklet-scweather-0.3.ebuild:
+  Version bump; got rid of the ugly hack in src_unpack that was necessary for
+  the Control to install correctly
+
+*desklet-scweather-0.1-r1 (26 May 2005)
+
+  26 May 2005; Joe Sapp <nixphoeni@gentoo.org>
+  +desklet-scweather-0.1-r1.ebuild:
+  Fixed the problem with gdesklets-core-0.35rc1 (and presumably future versions)
 
 *desklet-scweather-0.1 (26 May 2005)
 
diff --git a/x11-plugins/desklet-scweather/Manifest b/x11-plugins/desklet-scweather/Manifest
index 90ce39b3c321..f8e472589858 100644
--- a/x11-plugins/desklet-scweather/Manifest
+++ b/x11-plugins/desklet-scweather/Manifest
@@ -1,3 +1,10 @@
-MD5 d6a602e491b510aeb09c2367d1d5b2cb desklet-scweather-0.1.ebuild 680
+MD5 202684755708d31fecdf0231767ddda6 ChangeLog 1254
+MD5 c6a4b952544f09b5b2dcd5522a47ff76 desklet-scweather-0.1-r1.ebuild 946
+MD5 99c5658b8a80ad5d514d460c3a14c1ce desklet-scweather-0.1.ebuild 799
+MD5 8b7d9c005445fd5758d12df12b7ab7a6 desklet-scweather-0.3.ebuild 683
+MD5 e418e28d04b62f6c38aaea409316f26c desklet-scweather-0.4.ebuild 689
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 664529ad95448d873ba06cdc877adb23 files/digest-desklet-scweather-0.1 67
+MD5 664529ad95448d873ba06cdc877adb23 files/digest-desklet-scweather-0.1-r1 67
+MD5 3407b3a3afdfac43d375d0c93bfc8e6c files/digest-desklet-scweather-0.3 67
+MD5 c503993e7495e4624b4c724d41317cb3 files/digest-desklet-scweather-0.4 67
diff --git a/x11-plugins/desklet-scweather/desklet-scweather-0.1-r1.ebuild b/x11-plugins/desklet-scweather/desklet-scweather-0.1-r1.ebuild
index 654bbd093297..b37cb6d63b33 100644
--- a/x11-plugins/desklet-scweather/desklet-scweather-0.1-r1.ebuild
+++ b/x11-plugins/desklet-scweather/desklet-scweather-0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.1-r1.ebuild,v 1.1 2005/05/26 03:27:16 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit gdesklets
 
diff --git a/x11-plugins/desklet-scweather/desklet-scweather-0.1.ebuild b/x11-plugins/desklet-scweather/desklet-scweather-0.1.ebuild
index 3ab9327bac90..95fe4422103a 100644
--- a/x11-plugins/desklet-scweather/desklet-scweather-0.1.ebuild
+++ b/x11-plugins/desklet-scweather/desklet-scweather-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.1.ebuild,v 1.1 2005/05/26 03:00:40 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit gdesklets
 
diff --git a/x11-plugins/desklet-scweather/desklet-scweather-0.3.ebuild b/x11-plugins/desklet-scweather/desklet-scweather-0.3.ebuild
index f9af4026f8de..1fa55eb6a814 100644
--- a/x11-plugins/desklet-scweather/desklet-scweather-0.3.ebuild
+++ b/x11-plugins/desklet-scweather/desklet-scweather-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.3.ebuild,v 1.1 2005/06/08 03:21:41 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86 ~sparc"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
 
diff --git a/x11-plugins/desklet-scweather/desklet-scweather-0.4.ebuild b/x11-plugins/desklet-scweather/desklet-scweather-0.4.ebuild
index ee4def277986..00005796d1fd 100644
--- a/x11-plugins/desklet-scweather/desklet-scweather-0.4.ebuild
+++ b/x11-plugins/desklet-scweather/desklet-scweather-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.4.ebuild,v 1.1 2005/08/30 14:40:20 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-scweather/desklet-scweather-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
 
diff --git a/x11-plugins/desklet-sidecandy/ChangeLog b/x11-plugins/desklet-sidecandy/ChangeLog
index 1adcb01156b5..c08ceb536525 100644
--- a/x11-plugins/desklet-sidecandy/ChangeLog
+++ b/x11-plugins/desklet-sidecandy/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-plugins/desklet-sidecandy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandy/ChangeLog,v 1.1 2005/04/23 04:48:28 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  21 Sep 2005; Homer Parker <hparker@gentoo.org>
+  desklet-sidecandy-0.10.ebuild:
+  Marked ~amd64.
+
+  29 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  desklet-sidecandy-0.10.ebuild:
+  ~sparc it up baby
+
+  09 May 2005; David Holm <dholm@gentoo.org> desklet-sidecandy-0.10.ebuild:
+  Added to ~ppc.
 
 *desklet-sidecandy-0.10 (23 Apr 2005)
 
diff --git a/x11-plugins/desklet-sidecandy/Manifest b/x11-plugins/desklet-sidecandy/Manifest
index 9fca27ad0c4d..2665d2a0ae95 100644
--- a/x11-plugins/desklet-sidecandy/Manifest
+++ b/x11-plugins/desklet-sidecandy/Manifest
@@ -1,4 +1,4 @@
-MD5 7fa0a67cfa7640edd77e06a724b8e67d desklet-sidecandy-0.10.ebuild 560
-MD5 f16cd279f9e317cab773cbb9dab6c74f ChangeLog 283
+MD5 bdd58448ca3facd64e3d2167ec42f076 ChangeLog 687
+MD5 86bcf3ae86a5ade485218ee3a7c858e5 desklet-sidecandy-0.10.ebuild 701
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 bcd50e6303377645d92ba7165a891ef0 files/digest-desklet-sidecandy-0.10 66
diff --git a/x11-plugins/desklet-sidecandy/desklet-sidecandy-0.10.ebuild b/x11-plugins/desklet-sidecandy/desklet-sidecandy-0.10.ebuild
index b08891564dd0..29c8967f3ca4 100644
--- a/x11-plugins/desklet-sidecandy/desklet-sidecandy-0.10.ebuild
+++ b/x11-plugins/desklet-sidecandy/desklet-sidecandy-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandy/desklet-sidecandy-0.10.ebuild,v 1.1 2005/04/23 04:48:28 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandy/desklet-sidecandy-0.10.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
 
diff --git a/x11-plugins/desklet-sidecandygmail/ChangeLog b/x11-plugins/desklet-sidecandygmail/ChangeLog
index 38f8e39e5585..bb058576447b 100644
--- a/x11-plugins/desklet-sidecandygmail/ChangeLog
+++ b/x11-plugins/desklet-sidecandygmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/desklet-sidecandygmail
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandygmail/ChangeLog,v 1.1 2005/05/27 00:08:52 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandygmail/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  27 May 2005; Joe Sapp <nixphoeni@gentoo.org>
+  desklet-sidecandygmail-0.4.2.ebuild:
+  Took out unnecessary comments
 
 *desklet-sidecandygmail-0.4.2 (26 May 2005)
 
diff --git a/x11-plugins/desklet-sidecandygmail/Manifest b/x11-plugins/desklet-sidecandygmail/Manifest
index f5f35bcaeef4..9c8c18a21efc 100644
--- a/x11-plugins/desklet-sidecandygmail/Manifest
+++ b/x11-plugins/desklet-sidecandygmail/Manifest
@@ -1,2 +1,4 @@
-MD5 cf2473e4fcdeecf8d4acd4c5ee3a5cf6 desklet-sidecandygmail-0.4.2.ebuild 1147
+MD5 14cf51c270a09702719b2045ad86bf7e desklet-sidecandygmail-0.4.2.ebuild 1211
+MD5 db855f3edfed289ac98424107f828869 ChangeLog 513
+MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 08597aee76a2fefad9cae7f909ebd66c files/digest-desklet-sidecandygmail-0.4.2 72
diff --git a/x11-plugins/desklet-sidecandygmail/desklet-sidecandygmail-0.4.2.ebuild b/x11-plugins/desklet-sidecandygmail/desklet-sidecandygmail-0.4.2.ebuild
index 8a941e69cb4c..8bdd22b05eaa 100644
--- a/x11-plugins/desklet-sidecandygmail/desklet-sidecandygmail-0.4.2.ebuild
+++ b/x11-plugins/desklet-sidecandygmail/desklet-sidecandygmail-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandygmail/desklet-sidecandygmail-0.4.2.ebuild,v 1.1 2005/05/27 00:08:52 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandygmail/desklet-sidecandygmail-0.4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 inherit gdesklets
 
@@ -39,7 +39,5 @@ src_install() {
 	gdesklets_src_install
 
 	dohtml -r ${S}/icons-readme
-	#dohtml icons-readme/Readme.htm
-	#dohtml -r icons-readme/Readme_Files
 
 }
diff --git a/x11-plugins/desklet-sidecandyrhythmbox/ChangeLog b/x11-plugins/desklet-sidecandyrhythmbox/ChangeLog
index aa11e5c6f436..cc121d22792d 100644
--- a/x11-plugins/desklet-sidecandyrhythmbox/ChangeLog
+++ b/x11-plugins/desklet-sidecandyrhythmbox/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-plugins/desklet-sidecandyrhythmbox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandyrhythmbox/ChangeLog,v 1.1 2005/05/07 04:04:10 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandyrhythmbox/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  21 Sep 2005; Homer Parker <hparker@gentoo.org>
+  desklet-sidecandyrhythmbox-0.72-r1.ebuild:
+  Marked ~amd64.
+
+  29 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  desklet-sidecandyrhythmbox-0.72-r1.ebuild:
+  To ~sparc
+
+*desklet-sidecandyrhythmbox-0.72-r1 (27 May 2005)
+
+  27 May 2005; Joe Sapp <nixphoeni@gentoo.org>
+  +desklet-sidecandyrhythmbox-0.72-r1.ebuild:
+  Added SideCandy fix for versions 0.35_rc1 and greater (presumably)
+
+  09 May 2005; David Holm <dholm@gentoo.org>
+  desklet-sidecandyrhythmbox-0.72.ebuild:
+  Added to ~ppc.
 
 *desklet-sidecandyrhythmbox-0.72 (07 May 2005)
 
diff --git a/x11-plugins/desklet-sidecandyrhythmbox/Manifest b/x11-plugins/desklet-sidecandyrhythmbox/Manifest
index 4a437b5f8ac8..a973c0168926 100644
--- a/x11-plugins/desklet-sidecandyrhythmbox/Manifest
+++ b/x11-plugins/desklet-sidecandyrhythmbox/Manifest
@@ -1,4 +1,6 @@
-MD5 7bd636101216fbf9842892667edec473 desklet-sidecandyrhythmbox-0.72.ebuild 570
-MD5 10d06300bd04836a2f35268fe7bd25fe ChangeLog 295
+MD5 4faca787194b65707be31580096e5a90 ChangeLog 949
+MD5 573364a002b9cdb1bee670d8f57dda4d desklet-sidecandyrhythmbox-0.72-r1.ebuild 897
+MD5 ff23c9f437096671565a8bf5d7111226 desklet-sidecandyrhythmbox-0.72.ebuild 713
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
 MD5 77ad997f11133f9abcaf60cf16342611 files/digest-desklet-sidecandyrhythmbox-0.72 74
+MD5 77ad997f11133f9abcaf60cf16342611 files/digest-desklet-sidecandyrhythmbox-0.72-r1 74
diff --git a/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72-r1.ebuild b/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72-r1.ebuild
index dce4210d9515..d2b7a8dcde35 100644
--- a/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72-r1.ebuild
+++ b/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72-r1.ebuild,v 1.1 2005/05/27 00:49:41 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3
 	media-sound/rhythmbox"
diff --git a/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72.ebuild b/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72.ebuild
index 69acff4e961f..10564c19594a 100644
--- a/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72.ebuild
+++ b/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72.ebuild,v 1.1 2005/05/07 04:04:10 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sidecandyrhythmbox/desklet-sidecandyrhythmbox-0.72.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3
 	media-sound/rhythmbox"
diff --git a/x11-plugins/desklet-starterbar/ChangeLog b/x11-plugins/desklet-starterbar/ChangeLog
index f7246afbb934..5566b7b6010b 100644
--- a/x11-plugins/desklet-starterbar/ChangeLog
+++ b/x11-plugins/desklet-starterbar/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for x11-plugins/desklet-starterbar
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/ChangeLog,v 1.1 2003/09/09 05:18:53 obz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+  16 Sep 2005; <dang@gentoo.org> desklet-starterbar-0.31.3-r1.ebuild:
+  Marked stable on amd64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  desklet-starterbar-0.31.3-r1.ebuild:
+  Stable on ppc.
+
+  30 Aug 2005; Joe Sapp <nixphoeni@gentoo.org>
+  desklet-starterbar-0.31.3-r1.ebuild:
+  Marked stable on x86
+
+  27 Aug 2005; Joe Sapp <nixphoeni@gentoo.org>
+  -desklet-starterbar-0.31.3.ebuild:
+  Removed 0.31.3 since it's obsoleted by -r1
+
+*desklet-starterbar-0.31.3-r1 (07 Jul 2005)
+
+  07 Jul 2005; Joe Sapp <nixphoeni@gentoo.org>
+  +desklet-starterbar-0.31.3-r1.ebuild:
+  Added gnome-panel to RDEPEND since starterbar needs gnome-desktop-item-edit
+
+*desklet-starterbar-0.31.3 (09 Jun 2005)
+
+  09 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
+  -desklet-starterbar-0.31.ebuild, -desklet-starterbar-0.31.1.ebuild,
+  +desklet-starterbar-0.31.3.ebuild:
+  version bump
+
+  04 May 2005; David Holm <dholm@gentoo.org>
+  desklet-starterbar-0.31.2.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+*desklet-starterbar-0.31.2 (19 Apr 2005)
+
+  19 Apr 2005; Joe Sapp <nixphoeni@gentoo.org>
+  +desklet-starterbar-0.31.2.ebuild:
+  Using the new eclass and bumping version
+
+*desklet-starterbar-0.31.1 (16 Dec 2004)
+
+  16 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +desklet-starterbar-0.31.1.ebuild:
+  New version, for gdesklets-core-0.32
+
+*desklet-starterbar-0.31 (02 Dec 2004)
+
+  02 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +desklet-starterbar-0.31.ebuild:
+  New version
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  desklet-starterbar-0.21.ebuild, desklet-starterbar-0.22.1.ebuild,
+  desklet-starterbar-0.30.ebuild:
+  Masked desklet-starterbar-0.30.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  desklet-starterbar-0.21.ebuild, desklet-starterbar-0.22.1.ebuild:
+  Masked desklet-starterbar-0.22.1.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  desklet-starterbar-0.21.ebuild:
+  Masked desklet-starterbar-0.21.ebuild stable for ppc
+
+*desklet-starterbar-0.30 (15 Jul 2004)
+
+  15 Jul 2004; Mike Gardiner <obz@gentoo.org> +desklet-starterbar-0.30.ebuild:
+  New version. Removed alpha and sparc keywords, as the dependency pyxdg isn't
+  available for those archs yet
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
+  desklet-starterbar-0.22.1.ebuild:
+  Mark stable on amd64.
+
+  04 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  desklet-starterbar-0.22.1.ebuild:
+  Add ~alpha for bug 46601
+
+*desklet-starterbar-0.22.1 (12 Nov 2003)
+
+  12 Nov 2003; Mike Gardiner <obz@gentoo.org> desklet-starterbar-0.20.ebuild,
+  desklet-starterbar-0.22.1.ebuild:
+  New version with fixed Sensor permissions, see bug #32907
+
+*desklet-starterbar-0.21 (02 Nov 2003)
+
+  02 Nov 2003; Mike Gardiner <obz@gentoo.org> desklet-starterbar-0.12.ebuild,
+  desklet-starterbar-0.21.ebuild:
+  New version 0.21, removed (old) 0.12. This new version uses less CPU (finally)
+  and should have some fixes. Also includes previews (point nautilus at
+  /usr/share/gdesklets/Displays/Starterbar)
+
+  01 Nov 2003; Luca Barbato <lu_zero@gentoo.org>
+  desklet-starterbar-0.12.ebuild, desklet-starterbar-0.20.ebuild:
+  Marked ~ppc
+
+*desklet-starterbar-0.20 (30 Sep 2003)
+
+  30 Sep 2003; Mike Gardiner <obz@gentoo.org> desklet-starterbar-0.20.ebuild:
+  New version, smoother icon zooming support as well as drag'n'drop features
+  which means the dep changed to -core-0.22
+
+  24 Sep 2003; Todd Sunderlin <todd@gentoo.org>
+  desklet-starterbar-0.12.ebuild:
+  added ~sparc keyword
 
 *desklet-starterbar-0.12 (09 Sep 2003)
 
diff --git a/x11-plugins/desklet-starterbar/Manifest b/x11-plugins/desklet-starterbar/Manifest
index bfcea5867804..fa7d4d3eccb3 100644
--- a/x11-plugins/desklet-starterbar/Manifest
+++ b/x11-plugins/desklet-starterbar/Manifest
@@ -1,2 +1,22 @@
-MD5 00f03d0a650729f91e769d3c5e20a971 desklet-starterbar-0.12.ebuild 915
-MD5 88bae70a5df5396fe2b86688d9767f75 files/digest-desklet-starterbar-0.12 75
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b37b75fbf6ffc0f207b7e80ecffbff8e desklet-starterbar-0.30.ebuild 1244
+MD5 234c6ddf97f8681e4855989793df925f desklet-starterbar-0.21.ebuild 1099
+MD5 704080d9c79994881b47826878550fbd desklet-starterbar-0.22.1.ebuild 1235
+MD5 2a036e42ee0ad2ddf6cedd81fed936ca desklet-starterbar-0.31.3-r1.ebuild 756
+MD5 5de19aee4e3cf5bbf523afad962c9cf1 desklet-starterbar-0.31.2.ebuild 739
+MD5 46d28ea3d6600e6ab52f8fabd8ec6c41 ChangeLog 3919
+MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
+MD5 6cb332f9bbab1da0ed9c0f4d45f393f1 files/digest-desklet-starterbar-0.31.3-r1 76
+MD5 780965281e4f0b18a7947846264ec4c6 files/digest-desklet-starterbar-0.21 75
+MD5 4675e9bc5d2c9b32b359f231a368d193 files/digest-desklet-starterbar-0.30 75
+MD5 01da384bca3fffa9e9a106097ceda0d7 files/digest-desklet-starterbar-0.22.1 77
+MD5 744e6e48a6f8c68b1519ad5e432054e4 files/digest-desklet-starterbar-0.31.2 77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKwBYomPajV0RnrERAlCBAJ90GLap/nvWjAD8+VNnEUg4ilVeZgCeJrSf
+JNimg9Js43CkoyxohEtLEzM=
+=+bOT
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/desklet-starterbar/desklet-starterbar-0.21.ebuild b/x11-plugins/desklet-starterbar/desklet-starterbar-0.21.ebuild
index 0a9a57bf5179..5512dadd292a 100644
--- a/x11-plugins/desklet-starterbar/desklet-starterbar-0.21.ebuild
+++ b/x11-plugins/desklet-starterbar/desklet-starterbar-0.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.21.ebuild,v 1.1 2003/11/02 10:27:40 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.21.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 DESKLET_NAME="StarterBar"
 
@@ -10,12 +10,12 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="An OSX like gnome panel for launchers"
 SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://gdesklets.gnomedesktop.org/"
+HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=13"
 LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ppc"
 
 DEPEND=">=gnome-extra/gdesklets-core-0.23"
 
diff --git a/x11-plugins/desklet-starterbar/desklet-starterbar-0.22.1.ebuild b/x11-plugins/desklet-starterbar/desklet-starterbar-0.22.1.ebuild
index c74ec8c1c942..2c12340f99b7 100644
--- a/x11-plugins/desklet-starterbar/desklet-starterbar-0.22.1.ebuild
+++ b/x11-plugins/desklet-starterbar/desklet-starterbar-0.22.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.22.1.ebuild,v 1.1 2003/11/12 10:57:25 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.22.1.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 DESKLET_NAME="StarterBar"
 
@@ -10,12 +10,12 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="An OSX like gnome panel for launchers"
 SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://gdesklets.gnomedesktop.org/"
+HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=13"
 LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ppc amd64 ~alpha"
 
 DEPEND=">=gnome-extra/gdesklets-core-0.23"
 
diff --git a/x11-plugins/desklet-starterbar/desklet-starterbar-0.30.ebuild b/x11-plugins/desklet-starterbar/desklet-starterbar-0.30.ebuild
index 0f6014755454..d3256d38ac10 100644
--- a/x11-plugins/desklet-starterbar/desklet-starterbar-0.30.ebuild
+++ b/x11-plugins/desklet-starterbar/desklet-starterbar-0.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.30.ebuild,v 1.1 2004/07/15 08:01:14 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.30.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 DESKLET_NAME="StarterBar"
 
@@ -15,7 +15,7 @@ LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ppc ~amd64"
 
 DEPEND=">=gnome-extra/gdesklets-core-0.26
 	>=dev-python/pyxdg-0.5"
diff --git a/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.2.ebuild b/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.2.ebuild
index 208aabf2b80f..694ce64e876a 100644
--- a/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.2.ebuild
+++ b/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.2.ebuild,v 1.1 2005/04/19 03:23:49 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.2.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit gdesklets
 
@@ -19,7 +19,7 @@ LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3
 	 =dev-python/pyxdg-0.8"
diff --git a/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.3-r1.ebuild b/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.3-r1.ebuild
index a41872e69ab1..c553458faebb 100644
--- a/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.3-r1.ebuild
+++ b/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.3-r1.ebuild,v 1.1 2005/07/07 01:35:22 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-starterbar/desklet-starterbar-0.31.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit gdesklets
 
@@ -19,7 +19,7 @@ LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3
 	>=gnome-base/gnome-panel-2.10.0-r1"
diff --git a/x11-plugins/desklet-wirelessmonitor/ChangeLog b/x11-plugins/desklet-wirelessmonitor/ChangeLog
index 584b88a8e41f..c1c68d723d76 100644
--- a/x11-plugins/desklet-wirelessmonitor/ChangeLog
+++ b/x11-plugins/desklet-wirelessmonitor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/desklet-wirelessmonitor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-wirelessmonitor/ChangeLog,v 1.1 2005/04/23 05:29:20 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-wirelessmonitor/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  02 Sep 2005; Tom Martin <slarti@gentoo.org>
+  desklet-wirelessmonitor-0.13.ebuild:
+  Marked ~amd64.
+
+  09 May 2005; David Holm <dholm@gentoo.org>
+  desklet-wirelessmonitor-0.13.ebuild:
+  Added to ~ppc.
 
 *desklet-wirelessmonitor-0.13 (23 Apr 2005)
 
diff --git a/x11-plugins/desklet-wirelessmonitor/Manifest b/x11-plugins/desklet-wirelessmonitor/Manifest
index b0108f426f54..98a11b6bd4b2 100644
--- a/x11-plugins/desklet-wirelessmonitor/Manifest
+++ b/x11-plugins/desklet-wirelessmonitor/Manifest
@@ -1,3 +1,14 @@
-MD5 2cae47a1de9f0a8b5e493bd2bad55b17 desklet-wirelessmonitor-0.13.ebuild 581
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eaf2589f995a961c836b61ae9f317204 ChangeLog 613
 MD5 6bdff92f19f48041cb28629b5174dae1 metadata.xml 162
+MD5 d5fe3091371baf596ceb6d8b57d2c408 desklet-wirelessmonitor-0.13.ebuild 717
 MD5 7db1dd837aefd0874ea58bf0f0616bad files/digest-desklet-wirelessmonitor-0.13 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGEPjCHk4+ZoBpvsRAroAAJ45SjCukUsfEfrMSEyQAhmONVlp/gCZAb9D
+MltGvEEBPYQC7flZlI5xPvI=
+=XP0D
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/desklet-wirelessmonitor/desklet-wirelessmonitor-0.13.ebuild b/x11-plugins/desklet-wirelessmonitor/desklet-wirelessmonitor-0.13.ebuild
index 6626a3681a41..14e7ccfa9f62 100644
--- a/x11-plugins/desklet-wirelessmonitor/desklet-wirelessmonitor-0.13.ebuild
+++ b/x11-plugins/desklet-wirelessmonitor/desklet-wirelessmonitor-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-wirelessmonitor/desklet-wirelessmonitor-0.13.ebuild,v 1.1 2005/04/23 05:29:20 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-wirelessmonitor/desklet-wirelessmonitor-0.13.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 inherit gdesklets
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=gnome-extra/gdesklets-core-0.34.3
 	net-wireless/wireless-tools"
diff --git a/x11-plugins/docker/ChangeLog b/x11-plugins/docker/ChangeLog
index 46c9c374ca97..97fbb57a42dd 100644
--- a/x11-plugins/docker/ChangeLog
+++ b/x11-plugins/docker/ChangeLog
@@ -1,6 +1,19 @@
-# ChangeLog for x11-misc/docker
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header
+# ChangeLog for x11-plugins/docker
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  08 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> docker-1.3-r1.ebuild,
+  docker-1.5.ebuild:
+  Fix HOMEPAGE/SRC_URI for bug 73110.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  26 Jul 2004; <malc@gentoo.org> docker-1.5.ebuild:
+  Add ~amd64 - closes bug #58438
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> docker-1.5.ebuild:
+  Stable on alpha.
 
 *docker-1.5 (07 Feb 2004)
 
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index e48e6e8fc9ef..d6fe83e49928 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,6 +1,16 @@
-MD5 53b653096797974251e0bea2a73b4936 ChangeLog 1024
-MD5 ea13f046fb87dd86ddb729708349b65d docker-1.3-r1.ebuild 597
-MD5 f7a2f55ed960e02fe0a8485037180534 docker-1.5.ebuild 601
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d91a03c370fc29ce11c7d4e723275f4b docker-1.3-r1.ebuild 584
+MD5 27e88d726b0456d5ffbcaae1dbc4ab4b docker-1.5.ebuild 594
+MD5 8fb0bc5791c2d19a7212df17db5a2759 ChangeLog 1711
 MD5 44fa0b00f8f0198138a0a5729f8d43dc metadata.xml 267
 MD5 414f9c88348f5d5be3b4a97f10934b74 files/digest-docker-1.3-r1 61
 MD5 49ca048bf409853a93c0544f9cd17b6f files/digest-docker-1.5 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB4BRvEZCkKN40op4RAs+FAKCBZLl1eLvaCPiCi9LEUUtCIj7dTwCfT1au
+RjotszP62B7Q8sIpdDTmX0Y=
+=JIHl
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/docker/docker-1.3-r1.ebuild b/x11-plugins/docker/docker-1.3-r1.ebuild
index 1a3c268b5c5c..9491755eebd3 100644
--- a/x11-plugins/docker/docker-1.3-r1.ebuild
+++ b/x11-plugins/docker/docker-1.3-r1.ebuild
@@ -1,26 +1,19 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.3-r1.ebuild,v 1.1 2004/02/07 04:30:15 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-SRC_URI="http://icculus.org/openbox/docker/${P}.tar.gz"
-HOMEPAGE="http://icculus.org/openbox/docker/"
+SRC_URI="http://icculus.org/openbox/2/docker/${P}.tar.gz"
+HOMEPAGE="http://icculus.org/openbox/2/docker/"
 
 DEPEND=">=dev-libs/glib-2.0.4"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
-
-src_compile() {
-
-	emake || die
-
-}
+KEYWORDS="x86 ppc ~sparc"
 
 src_install () {
-
-	dobin docker
+	dobin docker || die "failed to install docker"
 	dodoc COPYING README
 }
diff --git a/x11-plugins/docker/docker-1.5.ebuild b/x11-plugins/docker/docker-1.5.ebuild
index de4ca63c0990..4aab214c9aa6 100644
--- a/x11-plugins/docker/docker-1.5.ebuild
+++ b/x11-plugins/docker/docker-1.5.ebuild
@@ -1,26 +1,19 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild,v 1.1 2004/02/07 04:30:15 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-SRC_URI="http://icculus.org/openbox/docker/${P}.tar.gz"
-HOMEPAGE="http://icculus.org/openbox/docker/"
+SRC_URI="http://icculus.org/openbox/2/docker/${P}.tar.gz"
+HOMEPAGE="http://icculus.org/openbox/2/docker/"
 
 DEPEND=">=dev-libs/glib-2.0.4"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-
-src_compile() {
-
-	emake || die
-
-}
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
 
 src_install () {
-
-	dobin docker
+	dobin docker || die "failed to install docker"
 	dodoc COPYING README
 }
diff --git a/x11-plugins/e_modules/ChangeLog b/x11-plugins/e_modules/ChangeLog
index 657c4317265a..66eddf56de2e 100644
--- a/x11-plugins/e_modules/ChangeLog
+++ b/x11-plugins/e_modules/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-plugins/e_modules
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/e_modules/ChangeLog,v 1.1 2005/04/24 17:48:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/e_modules/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 *e_modules-* (24 Apr 2005)
 
diff --git a/x11-plugins/e_modules/Manifest b/x11-plugins/e_modules/Manifest
index e69de29bb2d1..7b30d124e623 100644
--- a/x11-plugins/e_modules/Manifest
+++ b/x11-plugins/e_modules/Manifest
@@ -0,0 +1,4 @@
+MD5 8acc3962e3e82e4eb5df8e53e93b208e e_modules-9999.ebuild 410
+MD5 9c65c9e29e722089ea50fcfc05d53e85 ChangeLog 338
+MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-e_modules-9999 0
diff --git a/x11-plugins/e_modules/e_modules-9999.ebuild b/x11-plugins/e_modules/e_modules-9999.ebuild
index 28e7666c311a..cdd535350959 100644
--- a/x11-plugins/e_modules/e_modules-9999.ebuild
+++ b/x11-plugins/e_modules/e_modules-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/e_modules/e_modules-9999.ebuild,v 1.1 2005/04/24 17:48:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/e_modules/e_modules-9999.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 inherit enlightenment
 
diff --git a/x11-plugins/epplets/ChangeLog b/x11-plugins/epplets/ChangeLog
index 99f9fab9188a..1575ef006bac 100644
--- a/x11-plugins/epplets/ChangeLog
+++ b/x11-plugins/epplets/ChangeLog
@@ -1,6 +1,24 @@
-# ChangeLog for x11-misc/epplet-base
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/ChangeLog,v 1.1 2003/11/06 15:40:14 vapier Exp $
+# ChangeLog for x11-plugins/epplets
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> epplets-0.7-r1.ebuild:
+  Mark 0.7-r1 stable on alpha
+
+  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> epplets-0.7-r1.ebuild:
+  ~alpha keyword.
+
+*epplets-0.7-r1 (08 Nov 2004)
+
+  08 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/0.7-compmgr-fix.patch, +epplets-0.7-r1.ebuild, -epplets-0.7.ebuild:
+  Version bump to add fix for compmgr #68057.
+
+  27 May 2004; Danny van Dyk <kugelfang@gentoo.org> epplets-0.7.ebuild:
+  Marked ~amd64.
+
+  02 Feb 2004; David Holm <dholm@gentoo.org> epplets-0.7.ebuild:
+  Added to ~ppc.
 
 *epplets-0.7 (06 Nov 2003)
 
diff --git a/x11-plugins/epplets/Manifest b/x11-plugins/epplets/Manifest
index 1f8d6ee8fc31..be18d5928900 100644
--- a/x11-plugins/epplets/Manifest
+++ b/x11-plugins/epplets/Manifest
@@ -1,4 +1,5 @@
-MD5 106830bd4b3cfc951a50a5498e925346 files/digest-epplets-0.7 64
-MD5 24984019bf3fd5db97e6cc26fc58972b epplets-0.7.ebuild 745
-MD5 4bdfb5a550e7b4333941abd9126b36c5 ChangeLog 493
 MD5 03bdbcabbe6a151da9ce0e537e916b2c metadata.xml 618
+MD5 d82fb01fba40541b56070e6afeb95b6d ChangeLog 1063
+MD5 1219be39943fff3ab3592d422ba999b4 epplets-0.7-r1.ebuild 867
+MD5 106830bd4b3cfc951a50a5498e925346 files/digest-epplets-0.7-r1 64
+MD5 5b32a2cbac5456c47ed90d9f55ab0a1c files/0.7-compmgr-fix.patch 1134
diff --git a/x11-plugins/epplets/epplets-0.7-r1.ebuild b/x11-plugins/epplets/epplets-0.7-r1.ebuild
index 6f3326950dfc..d3eb34ba0b4e 100644
--- a/x11-plugins/epplets/epplets-0.7-r1.ebuild
+++ b/x11-plugins/epplets/epplets-0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/epplets-0.7-r1.ebuild,v 1.1 2004/11/08 05:24:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/epplets/epplets-0.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/enlightenment/epplets-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/x11
@@ -26,13 +26,13 @@ src_unpack() {
 }
 
 src_compile() {
-	export EROOT=/usr
+	export EROOT=/usr/share/epplets
 	export EBIN=/usr/bin
 	econf || die
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc ChangeLog
 }
diff --git a/x11-plugins/fsviewer/ChangeLog b/x11-plugins/fsviewer/ChangeLog
index 4a0fa94ba4d5..6bf0e6e4c0ec 100644
--- a/x11-plugins/fsviewer/ChangeLog
+++ b/x11-plugins/fsviewer/ChangeLog
@@ -1,11 +1,29 @@
-# ChangeLog for x11-plugins/FSViewer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.1 2002/10/24 18:57:20 raker Exp $
+# ChangeLog for x11-plugins/fsviewer
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+*fsviewer-0.2.5 (22 Jun 2005)
+
+  22 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/fsviewer-0.2.5-windowmaker.patch, +metadata.xml,
+  +fsviewer-0.2.5.ebuild:
+  added metadata and version bump which fixes #76865
+
+  28 Jun 2004; <augustus@gentoo.org> fsviewer-0.2.3e-r1.ebuild:
+  Marrked amd64.  First fsviewer tag for amd64.
+
+*fsviewer-0.2.3e-r1 (05 Jun 2003)
+
+  05 Jun 2003; robh <robh@gentoo.org> fsviewer-0.2.3e-r1.ebuild,
+  fsviewer-0.2.3e.ebuild:
+  fixed /usr/share/GNUstep sillyness.
+
+*fsviewer-0.2.3e (24 Oct 2002)
+
+  24 Oct 2002; Nick Hadaway <raker@gentoo.org> fsviewer-0.2.3e.ebuild,
+  files/digest-fsviewer-0.2.3e :
+  Initial ebuild in portage.
 
 *FSViewer.app-0.2.3d (24 Jul 2002)                                              
   
-  24 Oct 2002; Nick Hadaway <raker@gentoo.org> FSViewer-0.2.3d.ebuild,
-  files/digest-FSViewer-0.2.3d :
-  Initial ebuild added to portage.  See bug #5540.
-                            
   24 Jul 2002; R.Wyrick <rob@wyrick.org> ChangeLog :
diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest
index e69de29bb2d1..13bb896fd533 100644
--- a/x11-plugins/fsviewer/Manifest
+++ b/x11-plugins/fsviewer/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4fcc34079dc1e2cbd91ae946958712dd ChangeLog 1013
+MD5 c6f2ddec336d7206b0c5db426ee6f2e1 fsviewer-0.2.3e-r1.ebuild 752
+MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231
+MD5 d6bb191a7f02ae1ef453c11492f76d0b fsviewer-0.2.5.ebuild 891
+MD5 2e3849f1c388150becdcaaace1a81ae4 files/digest-fsviewer-0.2.3e-r1 72
+MD5 42990483538b9e7f156739209b9817d2 files/fsviewer-0.2.5-windowmaker.patch 10838
+MD5 cb533e00910969bb4210ceacfd4751f6 files/digest-fsviewer-0.2.5 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCudqal5AvwDPiUowRAlkwAJwNj9A002BT868jppZ3CloqcH6sHQCgnmUd
+1o++UR2x2x/saDsp75BX1mM=
+=GjZ1
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.3e-r1.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.3e-r1.ebuild
index 542a25b27f4c..5768d9d9e12c 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.3e-r1.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.3e-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.3e-r1.ebuild,v 1.1 2003/06/05 00:38:48 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.3e-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
 DESCRIPTION="file system viewer for Window Maker"
 HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.bayernline.de/~gscholz/linux/fsviewer/${PN}.app-${PV}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc amd64"
 
 IUSE=""
 
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
index ad9cc1f7b95f..4ec20e97182e 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.1 2005/06/22 21:38:59 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
 inherit eutils
 
diff --git a/x11-plugins/gai-album/ChangeLog b/x11-plugins/gai-album/ChangeLog
index 282072a8ecd6..1d6eb95fb54f 100644
--- a/x11-plugins/gai-album/ChangeLog
+++ b/x11-plugins/gai-album/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-plugins/gai-album
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-album/ChangeLog,v 1.1 2004/05/09 20:20:16 lordvan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-album/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+*gai-album-0.7 (08 Oct 2004)
+
+  08 Oct 2004; root <root@gentoo.org> gai-album-0.6.ebuild,
+  gai-album-0.7.ebuild:
+  version bump, fixes Bug #59278 (thanks to Daniel Webert
+  <rockoo@rockoo.homelinux.org>)
+  
+  fix sandbox violation bug
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gai-album-0.6.ebuild:
+  Masked gai-album-0.6.ebuild stable for ppc
+
+  10 May 2004; David Holm <dholm@gentoo.org> gai-album-0.6.ebuild:
+  Added to ~ppc.
 
 *gai-album-0.6 (09 May 2004)
 
diff --git a/x11-plugins/gai-album/Manifest b/x11-plugins/gai-album/Manifest
index d1488a5ff091..c6ac39592d43 100644
--- a/x11-plugins/gai-album/Manifest
+++ b/x11-plugins/gai-album/Manifest
@@ -1,4 +1,16 @@
-MD5 847cdd65989fff447be5c0b9b12605f2 gai-album-0.6.ebuild 1042
-MD5 0bf42444680f404c1c3bc9a539c46766 ChangeLog 130
-MD5 4de810beafe6af976494dfe29abd5c60 metadata.xml 405
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76f72e3c48ef51fa8ea377fada8b6a32 gai-album-0.6.ebuild 1205
+MD5 0861d43702adb4a2d6bc36f2d32c21dc gai-album-0.7.ebuild 1201
+MD5 3b12d51d481363edc4abd20840df3749 ChangeLog 810
+MD5 0b02f54e912487912d18ae699b0fec8e metadata.xml 258
 MD5 a80f4d39670dede97d4703b6bcb2d89b files/digest-gai-album-0.6 65
+MD5 b785cc68cd01df1f06893ff6003af0d5 files/digest-gai-album-0.7 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBw0aMI1lqEGTUzyQRAqmWAKCvvSGl9OiPoL1bWiwWRJywhy1V+ACeMm6+
+B7sZzIE+QD0I0MMzog389gE=
+=S9F8
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gai-album/gai-album-0.6.ebuild b/x11-plugins/gai-album/gai-album-0.6.ebuild
index 1927cc50c105..8689ad5126d1 100644
--- a/x11-plugins/gai-album/gai-album-0.6.ebuild
+++ b/x11-plugins/gai-album/gai-album-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-album/gai-album-0.6.ebuild,v 1.1 2004/05/09 20:20:16 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-album/gai-album-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
@@ -9,7 +9,7 @@ HOMEPAGE="http://gai.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gai/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc"
 IUSE=""
 DEPEND=">=x11-libs/gai-0.5.3
 	>=media-sound/xmms-1.2.10"
@@ -28,7 +28,9 @@ src_compile() {
 src_install() {
 	# small hack so the gnome stuff gets installed in place
 	mv ${S}/Makefile ${S}/Makefile.orig
-	sed s%"GNOMEDIR = /usr"%"GNOMEDIR = ${D}/usr"% ${S}/Makefile.orig > ${S}/Makefile
+	sed s%"GNOMEDIR = /usr"%"GNOMEDIR = ${D}/usr"% ${S}/Makefile.orig | \
+		sed s%" /usr/share/apps"%" ${D}/usr/share/apps%" \
+		> ${S}/Makefile
 	einstall || die
 	dodoc BUGS COPYING CHANGES INSTALL README README.gai TODO ALBUMART xmms-song-change.sh
 }
diff --git a/x11-plugins/gai-album/gai-album-0.7.ebuild b/x11-plugins/gai-album/gai-album-0.7.ebuild
index a63374d3f319..0a93592313ea 100644
--- a/x11-plugins/gai-album/gai-album-0.7.ebuild
+++ b/x11-plugins/gai-album/gai-album-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-album/gai-album-0.7.ebuild,v 1.1 2004/10/08 17:11:09 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-album/gai-album-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
diff --git a/x11-plugins/gai-album/metadata.xml b/x11-plugins/gai-album/metadata.xml
index 383179d86999..9b63c53ff599 100644
--- a/x11-plugins/gai-album/metadata.xml
+++ b/x11-plugins/gai-album/metadata.xml
@@ -6,7 +6,5 @@
 <maintainer>
   <email>lordvan@gentoo.org</email>
   <name>Thomas Raschbacher</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/x11-plugins/gai-pager/ChangeLog b/x11-plugins/gai-pager/ChangeLog
index 5bce6e20ac0c..d2aefaf3e60d 100644
--- a/x11-plugins/gai-pager/ChangeLog
+++ b/x11-plugins/gai-pager/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-plugins/gai-pager
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pager/ChangeLog,v 1.1 2003/12/10 12:05:57 lordvan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pager/ChangeLog,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
+
+  08 Oct 2004; root <root@gentoo.org> gai-pager-0.2-r1.ebuild,
+  gai-pager-0.2.ebuild:
+  fixes Bug #56191, thanks to hollywoodb <hollywoodb@fastmail.fm>
+  removed gai-pager-0.2.ebuild
+
+*gai-pager-0.2-r1 (10 May 2004)
+
+  10 May 2004; David Holm <dholm@gentoo.org> gai-pager-0.2-r1.ebuild:
+  Added to ~ppc.
+
+  09 May 2004; Thomas Raschbacher <lordvan@gentoo.org> :
+  revision bump; fixes Bug #46770 (Thanks to Theefer)
 
 *gai-pager-0.2 (10 Dec 2003)
 
diff --git a/x11-plugins/gai-pager/Manifest b/x11-plugins/gai-pager/Manifest
index f839feda1dc6..a8fd14d9e9b3 100644
--- a/x11-plugins/gai-pager/Manifest
+++ b/x11-plugins/gai-pager/Manifest
@@ -1,4 +1,14 @@
-MD5 88475fe775ce5a08ace4b245906d4679 gai-pager-0.2.ebuild 887
-MD5 29cae906ecc295c7d7d684c7026e9148 ChangeLog 374
-MD5 4de810beafe6af976494dfe29abd5c60 metadata.xml 405
-MD5 e674768842f1983b98ad479c2a8c26be files/digest-gai-pager-0.2 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 73f5bf27c701284d208719bcc3d6f12d gai-pager-0.2-r1.ebuild 1092
+MD5 b796a75d664b4620bc48ac02820c691a ChangeLog 783
+MD5 0b02f54e912487912d18ae699b0fec8e metadata.xml 258
+MD5 e674768842f1983b98ad479c2a8c26be files/digest-gai-pager-0.2-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBw0arI1lqEGTUzyQRAqB/AKC921cceQfR/YxzOrNIWBqWAV3xngCfeoY2
+IhPX4v+9kLVMuwPiuQO4Drs=
+=u+fI
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gai-pager/gai-pager-0.2-r1.ebuild b/x11-plugins/gai-pager/gai-pager-0.2-r1.ebuild
index 8a8a375b7a81..14a872bdc93c 100644
--- a/x11-plugins/gai-pager/gai-pager-0.2-r1.ebuild
+++ b/x11-plugins/gai-pager/gai-pager-0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pager/gai-pager-0.2-r1.ebuild,v 1.1 2004/05/09 19:09:27 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pager/gai-pager-0.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
 MY_PV="${PV}"
 MY_P="${PN}-${MY_PV}"
@@ -9,7 +9,7 @@ HOMEPAGE="http://gai.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gai/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND=">=x11-libs/gai-0.5.0_pre6"
 
@@ -26,7 +26,9 @@ src_compile() {
 src_install() {
 	# small hack so the gnome picture gets installed in place
 	mv ${S}/Makefile ${S}/Makefile.orig
-	sed s%"GNOMEDIR = /usr"%"GNOMEDIR = ${D}/usr"% ${S}/Makefile.orig > ${S}/Makefile
+	sed s%"GNOMEDIR = /usr"%"GNOMEDIR = ${D}/usr"% ${S}/Makefile.orig | \
+	sed s%"PREFIX = /usr"%"PREFIX = ${D}/usr"% > ${S}/Makefile
+	dodir /usr
 	einstall || die
 	dodoc BUGS COPYING CHANGES INSTALL README README.gai TODO
 }
diff --git a/x11-plugins/gai-pager/metadata.xml b/x11-plugins/gai-pager/metadata.xml
index 383179d86999..9b63c53ff599 100644
--- a/x11-plugins/gai-pager/metadata.xml
+++ b/x11-plugins/gai-pager/metadata.xml
@@ -6,7 +6,5 @@
 <maintainer>
   <email>lordvan@gentoo.org</email>
   <name>Thomas Raschbacher</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/x11-plugins/gai-pal/ChangeLog b/x11-plugins/gai-pal/ChangeLog
index 18a364ca016f..0b63b13315ff 100644
--- a/x11-plugins/gai-pal/ChangeLog
+++ b/x11-plugins/gai-pal/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-plugins/gai-pal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pal/ChangeLog,v 1.1 2005/05/23 09:28:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pal/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 *gai-pal-0.7 (23 May 2005)
 
diff --git a/x11-plugins/gai-pal/Manifest b/x11-plugins/gai-pal/Manifest
index 244df9eda9f0..732c42721e70 100644
--- a/x11-plugins/gai-pal/Manifest
+++ b/x11-plugins/gai-pal/Manifest
@@ -1,4 +1,4 @@
-MD5 c58c560629738a857d02e643c376ab60 gai-pal-0.7.ebuild 547
-MD5 ddb5614c76dca6a29499b838ea11cec0 ChangeLog 258
+MD5 87f90e7089cf5c20eaef16fe402f54bb gai-pal-0.7.ebuild 646
+MD5 ad5f5db99d6306de09670ff82b663bd7 ChangeLog 348
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 9f47a1b68b3ffdc8053f8aed0f66b484 files/digest-gai-pal-0.7 64
diff --git a/x11-plugins/gai-pal/gai-pal-0.7.ebuild b/x11-plugins/gai-pal/gai-pal-0.7.ebuild
index 5d7acf39a851..d870a50a307f 100644
--- a/x11-plugins/gai-pal/gai-pal-0.7.ebuild
+++ b/x11-plugins/gai-pal/gai-pal-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pal/gai-pal-0.7.ebuild,v 1.1 2005/05/23 09:28:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gai-pal/gai-pal-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 DESCRIPTION="A friend that always has something wise or funny to say ;-)"
 HOMEPAGE="http://gai.sf.net"
diff --git a/x11-plugins/gaim-assistant/ChangeLog b/x11-plugins/gaim-assistant/ChangeLog
index 40c5c7736330..4f0b29c46621 100644
--- a/x11-plugins/gaim-assistant/ChangeLog
+++ b/x11-plugins/gaim-assistant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/gaim-assistant
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-assistant/ChangeLog,v 1.1 2004/12/08 16:28:31 rizzo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-assistant/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+*gaim-assistant-0.09 (06 Jan 2005)
+
+  06 Jan 2005; Don Seiler <rizzo@gentoo.org> +gaim-assistant-0.09.ebuild:
+  Version bump.  Closes 76883, thanks Jason Williams
 
 *gaim-assistant-0.07 (08 Dec 2004)
 
diff --git a/x11-plugins/gaim-assistant/Manifest b/x11-plugins/gaim-assistant/Manifest
index 95576c2aef8d..52e702213312 100644
--- a/x11-plugins/gaim-assistant/Manifest
+++ b/x11-plugins/gaim-assistant/Manifest
@@ -1,3 +1,16 @@
-MD5 772dce3497d3125e130d268b63273b24 metadata.xml 226
-MD5 1f1ab30fafd9518cbf55174f2301ee43 gaim-assistant-0.07.ebuild 723
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 27ae2076b9deb2d1024aeabc20f3780a ChangeLog 577
 MD5 41c7a475ead4d1c352bb8f46ffc0c507 files/digest-gaim-assistant-0.07 71
+MD5 873aa3023da3afb8f248c3eec0ae2b52 files/digest-gaim-assistant-0.09 71
+MD5 7b954baa0cfa13ec4d24f4dc46536bd9 gaim-assistant-0.07.ebuild 631
+MD5 c5987ca82ec8c74f1ffb4df0567f68a9 gaim-assistant-0.09.ebuild 631
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1vPxI1lqEGTUzyQRApMpAJ9lrSEtVMsuxV343SJMFdPwE1f0IgCfQgdy
+vDmQkaQH/wCG6mnt9kiJskw=
+=jN1k
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gaim-assistant/gaim-assistant-0.07.ebuild b/x11-plugins/gaim-assistant/gaim-assistant-0.07.ebuild
index 5e880d16b948..9c224b8f91e8 100644
--- a/x11-plugins/gaim-assistant/gaim-assistant-0.07.ebuild
+++ b/x11-plugins/gaim-assistant/gaim-assistant-0.07.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-assistant/gaim-assistant-0.07.ebuild,v 1.1 2004/12/08 16:28:31 rizzo Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-assistant/gaim-assistant-0.07.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 DESCRIPTION="Gaim Assistant is a plugin to Gaim that will allow you to forward messages to a different screen name should you become away."
 HOMEPAGE="http://gaim-assistant.sourceforge.net/"
@@ -14,16 +12,8 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.0"
-#RDEPEND=""
-
-#S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die
-	emake || die "emake failed"
-}
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc README TODO
 }
diff --git a/x11-plugins/gaim-assistant/gaim-assistant-0.09.ebuild b/x11-plugins/gaim-assistant/gaim-assistant-0.09.ebuild
index da69342641cd..d12ba1be8cac 100644
--- a/x11-plugins/gaim-assistant/gaim-assistant-0.09.ebuild
+++ b/x11-plugins/gaim-assistant/gaim-assistant-0.09.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-assistant/gaim-assistant-0.09.ebuild,v 1.1 2005/01/06 18:58:19 rizzo Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-assistant/gaim-assistant-0.09.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 DESCRIPTION="Gaim Assistant is a plugin to Gaim that will allow you to forward messages to a different screen name should you become away."
 HOMEPAGE="http://gaim-assistant.sourceforge.net/"
@@ -14,16 +12,8 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.0"
-#RDEPEND=""
-
-#S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die
-	emake || die "emake failed"
-}
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc README TODO
 }
diff --git a/x11-plugins/gaim-assistant/metadata.xml b/x11-plugins/gaim-assistant/metadata.xml
index 04ee15b1638d..3e2b4181f5be 100644
--- a/x11-plugins/gaim-assistant/metadata.xml
+++ b/x11-plugins/gaim-assistant/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-    <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gaim-encryption/ChangeLog b/x11-plugins/gaim-encryption/ChangeLog
index 3cbade8cd675..093368085ec6 100644
--- a/x11-plugins/gaim-encryption/ChangeLog
+++ b/x11-plugins/gaim-encryption/ChangeLog
@@ -1,6 +1,288 @@
-# ChangeLog for net-im/gaim-encryption
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.1 2004/07/08 15:32:53 rizzo Exp $
+# ChangeLog for x11-plugins/gaim-encryption
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  gaim-encryption-2.38.ebuild:
+  Mark 2.38 stable on alpha
+
+  02 Sep 2005; <dang@gentoo.org> ChangeLog:
+  Marked stable on amd64
+
+  30 Jul 2005; Guy Martin <gmsoft@gentoo.org> gaim-encryption-2.38.ebuild:
+  Stable on hppa.
+
+  19 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  gaim-encryption-2.38.ebuild:
+  Multilib fixes, stable on amd64.
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gaim-encryption-2.38.ebuild:
+  ppc stable
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  gaim-encryption-2.38.ebuild:
+  stable on mips
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  gaim-encryption-2.32-r1.ebuild, gaim-encryption-2.34.ebuild,
+  gaim-encryption-2.35.ebuild, gaim-encryption-2.36.ebuild,
+  gaim-encryption-2.37.ebuild, gaim-encryption-2.38.ebuild:
+  QA: Removed 'emake || make || die' and variants. Either a package is
+  parallel build safe or it is not. There's nothing like trying and falling
+  back.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  gaim-encryption-2.38.ebuild:
+  Stable on ppc64
+
+  15 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.38.ebuild:
+  Stable on sparc
+
+*gaim-encryption-2.38 (13 Jun 2005)
+
+  13 Jun 2005; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.38.ebuild:
+  Version bump, putting into x86 stable
+
+  14 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gaim-encryption-2.36.ebuild:
+  Stable on alpha.
+
+  14 May 2005; Guy Martin <gmsoft@gentoo.org> gaim-encryption-2.36.ebuild:
+  Stable on hppa.
+
+*gaim-encryption-2.37 (13 May 2005)
+
+  13 May 2005; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.37.ebuild:
+  Version bump
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org>
+  gaim-encryption-2.36.ebuild:
+  stable on ia64
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  gaim-encryption-2.36.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.36.ebuild:
+  Stable on sparc
+
+  06 Apr 2005; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.36.ebuild:
+  Stable on x86
+
+*gaim-encryption-2.36 (21 Mar 2005)
+
+  21 Mar 2005; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.36.ebuild:
+  Version bump
+
+*gaim-encryption-2.35 (27 Feb 2005)
+
+  27 Feb 2005; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.35.ebuild:
+  Version bump, closes Bug #83498
+
+  04 Feb 2005; Stephen P. Becker <geoman@gentoo.org>
+  gaim-encryption-2.32-r1.ebuild:
+  stable on mips
+
+*gaim-encryption-2.34 (23 Jan 2005)
+
+  23 Jan 2005; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.34.ebuild:
+  Version bump, 2.33 is no good
+
+*gaim-encryption-2.33 (22 Jan 2005)
+
+  22 Jan 2005; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.33.ebuild:
+  Version bump
+
+  05 Jan 2005; Guy Martin <gmsoft@gentoo.org> gaim-encryption-2.32-r1.ebuild:
+  Stable on hppa.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  gaim-encryption-2.32-r1.ebuild:
+  Stable on ppc64
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  gaim-encryption-2.32-r1.ebuild:
+  Stable on amd64.
+
+  15 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.32-r1.ebuild:
+  Stable on sparc
+
+  13 Dec 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32-r1.ebuild:
+  Stable on x86
+
+  07 Dec 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32-r1.ebuild,
+  gaim-encryption-2.32.ebuild:
+  Using 'make install' instead of einstall
+
+  02 Dec 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32-r1.ebuild:
+  Going back to standalone NSPR/NSS dependency. MozillaFirefox does not
+  provide pkgconfig and Mozilla is not available on all arches.
+
+  29 Nov 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32-r1.ebuild:
+  Allowing dep on mozilla-firefox and/or mozilla if users doesn't like
+  standalone NSS package. Closes Bug #69339
+
+*gaim-encryption-2.32-r1 (26 Nov 2004)
+
+  26 Nov 2004; Don Seiler <rizzo@gentoo.org>
+  +gaim-encryption-2.32-r1.ebuild, gaim-encryption-2.32.ebuild:
+  Revision bump to handle nspr install dir change, closes bug #72531
+
+  15 Nov 2004; Markus Rothe <corsair@gentoo.org> gaim-encryption-2.32.ebuild:
+  Marked ~ppc64; bug #58170
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -gaim-encryption-2.28.ebuild,
+  -gaim-encryption-2.29.ebuild, -gaim-encryption-2.30.ebuild,
+  -gaim-encryption-2.31.ebuild:
+  Pruning old versions
+
+  21 Oct 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  gaim-encryption-2.32.ebuild:
+  Stable on alpha, bug 68271.
+
+  21 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gaim-encryption-2.32.ebuild:
+  Stable amd64.
+
+  21 Oct 2004; Hardave Riar <hardave@gentoo.org> gaim-encryption-2.32.ebuild:
+  Stable on mips, bug #68271.
+
+  20 Oct 2004; Michael Hanselmann <hansmi@gentoo.org>
+  gaim-encryption-2.32.ebuild:
+  Stable on ppc.
+
+  20 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.32.ebuild:
+  Stable on sparc wrt #68271
+
+  20 Oct 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32.ebuild:
+  Stable on x86 for bug 68271
+
+  19 Oct 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32.ebuild:
+  NSS maintainer decided to change where the libs are installed, without
+  revision bump. This will force people to now re-install nss. Fixes bug
+  #67427
+
+*gaim-encryption-2.32 (16 Oct 2004)
+
+  16 Oct 2004; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.32.ebuild:
+  Version bump
+
+  05 Oct 2004; Guy Martin <gmsoft@gentoo.org> gaim-encryption-2.31.ebuild:
+  Stable on hppa.
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gaim-encryption-2.31.ebuild:
+  Stable on alpha.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> gaim-encryption-2.31.ebuild:
+  Stable on sparc.
+
+  02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gaim-encryption-2.31.ebuild:
+  Stable amd64.
+
+  01 Oct 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.31.ebuild:
+  Stable on x86
+
+*gaim-encryption-2.31 (18 Sep 2004)
+  
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>:
+  PPC stable
+
+  18 Sep 2004; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.31.ebuild:
+  Version bump
+
+  11 Sep 2004; Tom Martin <slarti@gentoo.org> gaim-encryption-2.30.ebuild:
+  Stable on amd64.
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> gaim-encryption-2.30.ebuild:
+  Stable on hppa.
+
+  03 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.30.ebuild:
+  Stable on sparc
+
+  03 Sep 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.30.ebuild:
+  Stable on x86
+
+*gaim-encryption-2.30 (27 Aug 2004)
+
+  27 Aug 2004; Brandon Low <lostlogic@gentoo.org>
+  +gaim-encryption-2.30.ebuild:
+  Bump, thanks to Benjamin Martin <outrage@gmx.net> on bug 61909
+
+  26 Aug 2004; <plasmaroo@gentoo.org> gaim-encryption-2.29.ebuild:
+  Marking stable on IA64, bug #61457.
+
+  26 Aug 2004; Hardave Riar <hardave@gentoo.org> gaim-encryption-2.29.ebuild:
+  Stable on mips. Bug #61457.
+
+  25 Aug 2004; Travis Tilley <lv@gentoo.org> gaim-encryption-2.29.ebuild:
+  stable on amd64
+
+  25 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gaim-encryption-2.29.ebuild:
+  Stable on alpha, bug 61457.
+
+  24 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.29.ebuild:
+  Stable on sparc wrt #61457
+
+  24 Aug 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.29.ebuild:
+  Stable on x86
+
+  14 Aug 2004; Tom Gall <tgall@gentoo.org> gaim-encryption-2.29.ebuild:
+  stable on ppc64, bug #58170
+
+*gaim-encryption-2.29 (13 Aug 2004)
+
+  13 Aug 2004; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.29.ebuild:
+  Version bump
+
+  02 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.28.ebuild:
+  Stable on hppa wrt #58612
+
+  29 Jul 2004; Stephen P. Becker <geoman@gentoo.org>
+  gaim-encryption-2.28.ebuild:
+  Stable on mips.
+
+  28 Jul 2004; <agriffis@gentoo.org> gaim-encryption-2.28.ebuild:
+  stable on alpha and ia64
+
+  28 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-encryption-2.28.ebuild:
+  Stable on sparc
+
+  27 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gaim-encryption-2.28.ebuild:
+  Stable amd64.
+
+  27 Jul 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.28.ebuild:
+  Stable on x86
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gaim-encryption-2.27.ebuild:
+  Stable on alpha.
+
+*gaim-encryption-2.28 (18 Jul 2004)
+
+  18 Jul 2004; Don Seiler <rizzo@gentoo.org> +gaim-encryption-2.28.ebuild:
+  Version bump
+
+*gaim-encryption-2.27-r1 (16 Jul 2004)
+
+  16 Jul 2004; Don Seiler <rizzo@gentoo.org>
+  +files/gaim-encryption_prpl-num.diff, +gaim-encryption-2.27-r1.ebuild:
+  Patched to work with gaim-0.80 until 2.28 comes out
 
   07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   gaim-encryption-2.27.ebuild:
@@ -35,7 +317,7 @@
   24 May 2004; Travis Tilley <lv@gentoo.org> gaim-encryption-2.25.ebuild:
   stable on amd64
 
-  01 May 2004; Bryan �stergaard <kloeri@gentoo.org>
+  01 May 2004; Bryan Østergaard <kloeri@gentoo.org>
   gaim-encryption-2.25.ebuild:
   Stable on alpha.
 
diff --git a/x11-plugins/gaim-encryption/Manifest b/x11-plugins/gaim-encryption/Manifest
index 34018f2906f0..43fe7d036129 100644
--- a/x11-plugins/gaim-encryption/Manifest
+++ b/x11-plugins/gaim-encryption/Manifest
@@ -1,6 +1,24 @@
-MD5 512db0af58375cb989512211be34ebde gaim-encryption-2.25.ebuild 1492
-MD5 c0d66c6e1fdd9a53f0ac609e22fdea2e gaim-encryption-2.27.ebuild 1123
-MD5 ab7db4bf9ff48c8de9da14fd12f6c15c metadata.xml 344
-MD5 f461c974d843dc05ee86f17a24623d20 ChangeLog 4641
-MD5 f6d7c4865e839026143ac5f87868ce6b files/digest-gaim-encryption-2.25 72
-MD5 0f841aa75334a0c388d872bee0608be6 files/digest-gaim-encryption-2.27 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d87e2e19db2674121a0ac6fd1729946 gaim-encryption-2.36.ebuild 973
+MD5 89dc5f0c668b2281d7914d72cc4d2931 gaim-encryption-2.37.ebuild 978
+MD5 f9adb0cad926cb239205a2b354cbda8b metadata.xml 286
+MD5 57d582591db88b3ff11256053a27eef5 gaim-encryption-2.35.ebuild 979
+MD5 d9ae6f547f88b32b1d2a2b4e50bcba61 ChangeLog 13239
+MD5 fd1990d36ce5bb9894308ba2e72ac71b gaim-encryption-2.32-r1.ebuild 973
+MD5 b45fff756dd5498a00552868cd96765e gaim-encryption-2.38.ebuild 999
+MD5 180b65fd7ff3e459281b883a9a3c46bb gaim-encryption-2.34.ebuild 979
+MD5 1bba644fecfb18831e18edb3d06f0de5 files/digest-gaim-encryption-2.35 72
+MD5 4f47ba1a5d57da23681402f4f6241581 files/digest-gaim-encryption-2.38 72
+MD5 69dd2444e1c1a7c90b61128c9912f975 files/digest-gaim-encryption-2.34 72
+MD5 185f9fc2aa864a611189ad3b74bcfbab files/digest-gaim-encryption-2.37 72
+MD5 ff64a30a61d21ad47aab6594e4b1325b files/digest-gaim-encryption-2.32-r1 72
+MD5 7921f3ce22b477f7a69db7f51ef56669 files/digest-gaim-encryption-2.36 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVQaHJrHF4yAQTrARAkxSAKCZRNIDot8jATgsaJ5lfK9/xw34bwCggukJ
+UGx/+Zo3HEVNGpOS1ceVzyo=
+=g9+2
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild
index edeb07b63c3c..764113d50511 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild,v 1.1 2004/11/27 02:07:26 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
-inherit flag-o-matic eutils debug
+inherit flag-o-matic debug
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
@@ -10,31 +10,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86 ppc64"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.1
-	>=dev-libs/nspr-4.4.1-r2
-	dev-libs/nss"
+		>=dev-libs/nss-3.9.2-r2"
 
 src_compile() {
-	local myconf
-
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
-	myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
-	myconf="${myconf} --with-nspr-libs=${NSS_LIB}/nspr"
-	myconf="${myconf} --with-nss-libs=${NSS_LIB}/nss"
-
-	econf ${myconf} || die "Configuration failed"
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-
-	emake || emake -j1 || die "Make failed"
+	strip-flags
+	replace-flags -O? -O2
+
+	econf \
+		--with-nspr-includes=/usr/include/nspr \
+		--with-nss-includes=/usr/include/nss \
+		--with-nspr-libs=/usr/lib/nspr \
+		--with-nss-libs=/usr/lib/nss\
+		|| die "Configuration failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
-	einstall || die "Install failed"
+	make install DESTDIR="${D}" || die "Install failed"
 	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-2.34.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-2.34.ebuild
index 5e073e658446..cfbe28122767 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-2.34.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-2.34.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.34.ebuild,v 1.1 2005/01/24 03:07:19 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.34.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
-inherit flag-o-matic eutils debug
+inherit flag-o-matic debug
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
@@ -20,18 +20,16 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	local myconf
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	econf \
+		--with-nspr-includes=/usr/include/nspr \
+		--with-nss-includes=/usr/include/nss \
+		--with-nspr-libs=/usr/lib/nspr \
+		--with-nss-libs=/usr/lib/nss\
+		|| die "Configuration failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "Install failed"
+	make install DESTDIR="${D}" || die "Install failed"
 	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-2.35.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-2.35.ebuild
index 1e4bd97738f7..6ac23ea1b700 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-2.35.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-2.35.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.35.ebuild,v 1.1 2005/02/27 23:25:33 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.35.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
-inherit flag-o-matic eutils debug
+inherit flag-o-matic debug
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
@@ -20,18 +20,16 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	local myconf
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	econf \
+		--with-nspr-includes=/usr/include/nspr \
+		--with-nss-includes=/usr/include/nss \
+		--with-nspr-libs=/usr/lib/nspr \
+		--with-nss-libs=/usr/lib/nss\
+		|| die "Configuration failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "Install failed"
+	make install DESTDIR="${D}" || die "Install failed"
 	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-2.36.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-2.36.ebuild
index 97a234ebc93b..643f4334458b 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-2.36.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-2.36.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.36.ebuild,v 1.1 2005/03/21 15:10:52 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.36.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
-inherit flag-o-matic eutils debug
+inherit flag-o-matic debug
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.1
@@ -20,18 +20,16 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	local myconf
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	econf \
+		--with-nspr-includes=/usr/include/nspr \
+		--with-nss-includes=/usr/include/nss \
+		--with-nspr-libs=/usr/lib/nspr \
+		--with-nss-libs=/usr/lib/nss\
+		|| die "Configuration failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "Install failed"
+	make install DESTDIR="${D}" || die "Install failed"
 	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-2.37.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-2.37.ebuild
index 1748d6019d5c..3dd4ff66d439 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-2.37.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-2.37.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.37.ebuild,v 1.1 2005/05/13 14:05:00 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.37.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
-inherit flag-o-matic eutils debug
+inherit flag-o-matic debug
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
@@ -20,18 +20,16 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	local myconf
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	econf \
+		--with-nspr-includes=/usr/include/nspr \
+		--with-nss-includes=/usr/include/nss \
+		--with-nspr-libs=/usr/lib/nspr \
+		--with-nss-libs=/usr/lib/nss\
+		|| die "Configuration failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "Install failed"
+	make install DESTDIR="${D}" || die "Install failed"
 	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-2.38.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-2.38.ebuild
index 8dfafe3eaad3..bab8f16fdf01 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-2.38.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-2.38.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.38.ebuild,v 1.1 2005/06/13 14:08:07 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.38.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
-inherit flag-o-matic eutils debug
+inherit flag-o-matic debug multilib
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.1
@@ -20,18 +20,16 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	local myconf
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	econf \
+		--with-nspr-includes=/usr/include/nspr \
+		--with-nss-includes=/usr/include/nss \
+		--with-nspr-libs=/usr/$(get_libdir)/nspr \
+		--with-nss-libs=/usr/$(get_libdir)/nss\
+		|| die "Configuration failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "Install failed"
+	make install DESTDIR="${D}" || die "Install failed"
 	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/x11-plugins/gaim-encryption/metadata.xml b/x11-plugins/gaim-encryption/metadata.xml
index dfbdaf5433a9..787bb14a0902 100644
--- a/x11-plugins/gaim-encryption/metadata.xml
+++ b/x11-plugins/gaim-encryption/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-    <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 <longdescription>
-Gaim-Encryption uses NSS to provide transparent RSA encryption as a Gaim plugin.
+Gaim-Encryption uses NSS or GNUTLSto provide transparent RSA encryption as a Gaim plugin.
 </longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/gaim-extprefs/ChangeLog b/x11-plugins/gaim-extprefs/ChangeLog
index bce9ce3c63a0..c52272eb4de7 100644
--- a/x11-plugins/gaim-extprefs/ChangeLog
+++ b/x11-plugins/gaim-extprefs/ChangeLog
@@ -1,6 +1,63 @@
 # ChangeLog for x11-plugins/gaim-extprefs
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/ChangeLog,v 1.1 2004/09/18 14:50:05 rizzo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> gaim-extprefs-0.5.ebuild:
+  stable on amd64
+
+  19 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-extprefs-0.5.ebuild:
+  Stable on sparc
+
+  18 Aug 2005; Don Seiler <rizzo@gentoo.org> gaim-extprefs-0.5.ebuild:
+  Stable on x86
+
+*gaim-extprefs-0.5 (21 Jul 2005)
+
+  21 Jul 2005; Don Seiler <rizzo@gentoo.org> +gaim-extprefs-0.5.ebuild:
+  Version bump
+
+  19 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  gaim-extprefs-0.4-r1.ebuild:
+  Multilib fix.
+
+  19 Jul 2005; Olivier Crête <tester@gentoo.org>
+  gaim-extprefs-0.4-r1.ebuild:
+  Stable on amd64
+
+*gaim-extprefs-0.4-r1 (04 Jun 2005)
+
+  04 Jun 2005; Olivier Crête <tester@gentoo.org>
+  +files/gaim-extprefs-0.4-64bitfix.patch, +gaim-extprefs-0.4-r1.ebuild:
+  Fixed building with libtool >1.5.14 and on amd64, thanks to Joe Bormolini
+  <lordjoe@bigfoot.com> from bug #93962 and to Ian Kumlien <pomac@vapor.com>
+  from bug #94687
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-extprefs-0.4.ebuild:
+  Stable on sparc
+
+  25 Mar 2005; <blubb@gentoo.org> gaim-extprefs-0.4.ebuild:
+  added ~amd64
+
+  21 Mar 2005; Don Seiler <rizzo@gentoo.org> -gaim-extprefs-0.3.ebuild,
+  gaim-extprefs-0.4.ebuild:
+  Stable on x86, closes bug #85737
+
+*gaim-extprefs-0.4 (14 Dec 2004)
+
+  14 Dec 2004; Don Seiler <rizzo@gentoo.org> +gaim-extprefs-0.4.ebuild:
+  Version bump
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> gaim-extprefs-0.3.ebuild:
+  Added to ~ppc.
+
+  30 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-extprefs-0.3.ebuild:
+  Keyworded ~sparc
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> gaim-extprefs-0.3.ebuild:
+  Stable on x86, pruning old versions
 
 *gaim-extprefs-0.3 (18 Sep 2004)
 
diff --git a/x11-plugins/gaim-extprefs/Manifest b/x11-plugins/gaim-extprefs/Manifest
index 426b64ccadb5..befb501db8ab 100644
--- a/x11-plugins/gaim-extprefs/Manifest
+++ b/x11-plugins/gaim-extprefs/Manifest
@@ -1,2 +1,9 @@
-MD5 f259bb39dfc029a1177d9e54eb97e1ca gaim-extprefs-0.3.ebuild 520
-MD5 ef683462e25321d9f94fbeda3a7065d2 files/digest-gaim-extprefs-0.3 68
+MD5 f347e5db7dc6e195ba8056d3f4ac59b9 ChangeLog 2053
+MD5 ada0fe081e6b55460c3ab3af792f3f86 gaim-extprefs-0.4.ebuild 837
+MD5 5ea733f952a3dbf743ed837d688d4ff5 metadata.xml 331
+MD5 cf2e004221534fcb67712031c61cc1d0 gaim-extprefs-0.4-r1.ebuild 1021
+MD5 67a76fdfd26f3cad1b7f84d40505262e gaim-extprefs-0.5.ebuild 794
+MD5 8208e6ff994eddc392fee60515f96f43 files/digest-gaim-extprefs-0.4 68
+MD5 8208e6ff994eddc392fee60515f96f43 files/digest-gaim-extprefs-0.4-r1 68
+MD5 22d0ed82c098cff251a1abc3064b0a1b files/gaim-extprefs-0.4-64bitfix.patch 2611
+MD5 369aa0fe80ad18c85e651da3da476b4f files/digest-gaim-extprefs-0.5 69
diff --git a/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild b/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild
index f9e848194f0d..24ffd0230f13 100644
--- a/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild
+++ b/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild,v 1.1 2005/06/04 07:42:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/gaim-extprefs-0.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
-inherit eutils
+inherit multilib eutils
 
-DESCRIPTION="Gaim Extended Preferences is a plugin that takes advantage of existing gaim functionality to provide preferences that are often desired but not are not considered worthy of inclusion in Gaim itself."
+DESCRIPTION="A plugin that takes advantage of existing gaim functionality to
+provide preferences that are often desired but are not included in gaim."
 
 HOMEPAGE="http://gaim-extprefs.sourceforge.net"
 
@@ -14,7 +15,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 
 IUSE=""
 
@@ -30,6 +31,9 @@ src_unpack() {
 
 	cd ${S}
 	epatch  ${FILESDIR}/${P}-64bitfix.patch
+
+	sed -i -e "s:\$(PREFIX)/lib/:\$(PREFIX)/$(get_libdir)/:" \
+		${S}/src/Makefile || die "sed failed"
 }
 
 src_compile() {
diff --git a/x11-plugins/gaim-extprefs/gaim-extprefs-0.4.ebuild b/x11-plugins/gaim-extprefs/gaim-extprefs-0.4.ebuild
index b65e83dc12ac..37cab1683fe9 100644
--- a/x11-plugins/gaim-extprefs/gaim-extprefs-0.4.ebuild
+++ b/x11-plugins/gaim-extprefs/gaim-extprefs-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/gaim-extprefs-0.4.ebuild,v 1.1 2004/12/14 07:10:37 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/gaim-extprefs-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 DESCRIPTION="Gaim Extended Preferences is a plugin that takes advantage of existing gaim functionality to provide preferences that are often desired but not are not considered worthy of inclusion in Gaim itself."
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 
 IUSE=""
 
diff --git a/x11-plugins/gaim-extprefs/gaim-extprefs-0.5.ebuild b/x11-plugins/gaim-extprefs/gaim-extprefs-0.5.ebuild
index 6da5a540af1a..b00b47e9227f 100644
--- a/x11-plugins/gaim-extprefs/gaim-extprefs-0.5.ebuild
+++ b/x11-plugins/gaim-extprefs/gaim-extprefs-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/gaim-extprefs-0.5.ebuild,v 1.1 2005/07/21 03:41:40 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-extprefs/gaim-extprefs-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 DESCRIPTION="Gaim Extended Preferences is a plugin that takes advantage of existing gaim functionality to provide preferences that are often desired but not are not considered worthy of inclusion in Gaim itself."
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 IUSE=""
 
diff --git a/x11-plugins/gaim-extprefs/metadata.xml b/x11-plugins/gaim-extprefs/metadata.xml
index ec46efae0813..7a78d04929eb 100644
--- a/x11-plugins/gaim-extprefs/metadata.xml
+++ b/x11-plugins/gaim-extprefs/metadata.xml
@@ -2,8 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-  <email>gaim-bugs@gentoo.org</email>
-</maintainer>
-<longdescription>Gaim Extended Preferences is a plugin that takes advantage of existing gaim functionality to provide preferences that are often desired but not are not considered worthy of inclusion in Gaim itself.</longdescription>
+<longdescription>A plugin that takes advantage of existing gaim functionality to provide preferences that are often desired but are not included in gaim.</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/gaim-latex/ChangeLog b/x11-plugins/gaim-latex/ChangeLog
index a36f3b36532c..cbbf77509992 100644
--- a/x11-plugins/gaim-latex/ChangeLog
+++ b/x11-plugins/gaim-latex/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-plugins/gaim-latex
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-latex/ChangeLog,v 1.1 2005/05/10 14:59:23 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-latex/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+*gaim-latex-0.3-r1 (14 Nov 2005)
+
+  14 Nov 2005; Don Seiler <rizzo@gentoo.org> +gaim-latex-0.3-r1.ebuild:
+  Change install loc for gaim-latex lib.  Bug #112381
+
+  08 Sep 2005; Simon Stelling <blubb@gentoo.org> gaim-latex-0.3.ebuild:
+  add ~amd64, add -fPIC, make multilib-strict aware: bug 103538
+
+  17 Jun 2005; David Holm <dholm@gentoo.org> gaim-latex-0.3.ebuild:
+  Added to ~ppc.
+
+*gaim-latex-0.3 (16 Jun 2005)
+
+  16 Jun 2005; Don Seiler <rizzo@gentoo.org> +gaim-latex-0.3.ebuild:
+  Version bump, closes Bug #94995.  Thanks to Claessens Xavier
 
 *gaim-latex-0.2 (10 May 2005)
 
diff --git a/x11-plugins/gaim-latex/Manifest b/x11-plugins/gaim-latex/Manifest
index f7a071e900fe..6a64d769859a 100644
--- a/x11-plugins/gaim-latex/Manifest
+++ b/x11-plugins/gaim-latex/Manifest
@@ -1,2 +1,6 @@
-MD5 a75ba516386b8f3c3412a89ea9e1cbc5 gaim-latex-0.2.ebuild 560
-MD5 ba3448e7e766c1e3565068fa6fcf6475 files/digest-gaim-latex-0.2 65
+MD5 2339469eb1dbe0ac623f0d5c93205232 ChangeLog 936
+MD5 c149f4d4c512fd5429e77f61bb07dd43 gaim-latex-0.3-r1.ebuild 787
+MD5 bab3872b102b8d67b9f9655b4b51811a metadata.xml 218
+MD5 e002155083035d2ca44079677aac531e gaim-latex-0.3.ebuild 779
+MD5 f64061875de9ea65564ed4a5081f2324 files/digest-gaim-latex-0.3 66
+MD5 f64061875de9ea65564ed4a5081f2324 files/digest-gaim-latex-0.3-r1 66
diff --git a/x11-plugins/gaim-latex/gaim-latex-0.3-r1.ebuild b/x11-plugins/gaim-latex/gaim-latex-0.3-r1.ebuild
index f81fada0ec15..5c5ac1fdfd0f 100644
--- a/x11-plugins/gaim-latex/gaim-latex-0.3-r1.ebuild
+++ b/x11-plugins/gaim-latex/gaim-latex-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-latex/gaim-latex-0.3-r1.ebuild,v 1.1 2005/11/14 19:18:03 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-latex/gaim-latex-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 inherit flag-o-matic multilib
 
diff --git a/x11-plugins/gaim-latex/gaim-latex-0.3.ebuild b/x11-plugins/gaim-latex/gaim-latex-0.3.ebuild
index eec6773b1aa6..6bc63fec337c 100644
--- a/x11-plugins/gaim-latex/gaim-latex-0.3.ebuild
+++ b/x11-plugins/gaim-latex/gaim-latex-0.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-latex/gaim-latex-0.3.ebuild,v 1.1 2005/06/16 13:49:15 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-latex/gaim-latex-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+inherit flag-o-matic multilib
 
 DESCRIPTION="Gaim plugin that renders latex formulae"
 HOMEPAGE="http://sourceforge.net/projects/gaim-latex"
@@ -8,7 +10,7 @@ SRC_URI="mirror://sourceforge/gaim-latex/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="net-im/gaim"
@@ -17,11 +19,13 @@ RDEPEND="virtual/tetex
 
 src_compile()
 {
+	append-flags -fPIC
 	emake || die "emake failed"
 }
 
 src_install()
 {
-	make install PREFIX=${D}/usr || die "make install failed"
+	make LIB_INSTALL_DIR="${D}/usr/$(get_libdir)" install PREFIX=${D}/usr \
+	|| die "make install failed"
 	dodoc README CHANGELOG COPYING TODO
 }
diff --git a/x11-plugins/gaim-latex/metadata.xml b/x11-plugins/gaim-latex/metadata.xml
index 5748a8946565..bd079f6faeb0 100644
--- a/x11-plugins/gaim-latex/metadata.xml
+++ b/x11-plugins/gaim-latex/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-    <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 <longdescription>
 Latex plugin for gaim
 </longdescription>
diff --git a/x11-plugins/gaim-otr/ChangeLog b/x11-plugins/gaim-otr/ChangeLog
index 67f1eb70fcb8..96122ae1b2a2 100644
--- a/x11-plugins/gaim-otr/ChangeLog
+++ b/x11-plugins/gaim-otr/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for x11-plugins/gaim-otr
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.1 2004/12/16 22:48:31 rizzo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+*gaim-otr-3.0.0 (14 Nov 2005)
+
+  14 Nov 2005; Don Seiler <rizzo@gentoo.org> +gaim-otr-3.0.0.ebuild:
+  Version bump for bug #111645
+
+  01 Aug 2005; Joseph Jezak <josejx@gentoo.org> gaim-otr-2.0.2.ebuild:
+  Marked ~ppc for bug #100396.
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> gaim-otr-1.0.3.ebuild,
+  gaim-otr-2.0.0.ebuild, gaim-otr-2.0.1.ebuild, gaim-otr-2.0.2.ebuild:
+  QA: Removed 'emake || make || die' and variants. Either a package is
+  parallel build safe or it is not. There's nothing like trying and falling
+  back.
+
+*gaim-otr-2.0.2 (17 May 2005)
+
+  17 May 2005; Don Seiler <rizzo@gentoo.org> +gaim-otr-2.0.2.ebuild:
+  Version bump, closes bug #92440
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gaim-otr-2.0.1.ebuild:
+  Keyworded ~sparc
+
+*gaim-otr-2.0.1 (24 Feb 2005)
+
+  24 Feb 2005; Don Seiler <rizzo@gentoo.org> +gaim-otr-2.0.1.ebuild:
+  Version bump, closes bug #83173
+
+*gaim-otr-2.0.0 (10 Feb 2005)
+
+  10 Feb 2005; Don Seiler <rizzo@gentoo.org> +gaim-otr-2.0.0.ebuild:
+  Version bump
+
+  08 Feb 2005; Simon Stelling <blubb@gentoo.org>
+  +files/gaim-otr-1.0.3-fPIC.patch, gaim-otr-1.0.3.ebuild:
+  added David Leverton's patch to fix bug #80405
+
+*gaim-otr-1.0.3 (21 Jan 2005)
+
+  21 Jan 2005; Don Seiler <rizzo@gentoo.org> +gaim-otr-1.0.3.ebuild:
+  Version bump, closes bug #78887
+
+*gaim-otr-1.0.2 (17 Jan 2005)
+
+  17 Jan 2005; Don Seiler <rizzo@gentoo.org> +gaim-otr-1.0.2.ebuild:
+  Version bump, closes bug #78411
+
+  04 Jan 2005; Simon Stelling <blubb@gentoo.org> gaim-otr-1.0.1.ebuild:
+  added ~amd64
 
 *gaim-otr-1.0.1 (16 Dec 2004)
 
diff --git a/x11-plugins/gaim-otr/Manifest b/x11-plugins/gaim-otr/Manifest
index 4045e1c3e04f..f6e8d9cff580 100644
--- a/x11-plugins/gaim-otr/Manifest
+++ b/x11-plugins/gaim-otr/Manifest
@@ -1,2 +1,13 @@
-MD5 6bf068213a13e505faf96834f1845200 gaim-otr-1.0.1.ebuild 689
-MD5 38c912f054ef1733b1c843f400063c08 files/digest-gaim-otr-1.0.1 65
+MD5 d6a0a49c17ecce9bc0c306bdfbd9bcbf ChangeLog 1901
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+MD5 5ceb703114e1498905dbf5df52556c3e gaim-otr-2.0.0.ebuild 752
+MD5 60891b4da42ffa5dbe9310786063c166 gaim-otr-1.0.3.ebuild 848
+MD5 d89410fb22b224bb4fb16a0508a0f3b4 gaim-otr-2.0.1.ebuild 756
+MD5 8c4e72f45cdc3e3f0cdd1a88ee80c400 gaim-otr-2.0.2.ebuild 791
+MD5 4678d2c9bf1edc755d264a4a78d6955d gaim-otr-3.0.0.ebuild 790
+MD5 972e2f6cda3a9c79b1de8cbd95549597 files/digest-gaim-otr-2.0.0 65
+MD5 92722fbea66bd224305cdbdb38a2caa5 files/digest-gaim-otr-2.0.1 65
+MD5 25b670ffc82acacbee5777a73c30c608 files/digest-gaim-otr-1.0.3 65
+MD5 f35f82a092a303af1e9780ec9fd495fa files/gaim-otr-1.0.3-fPIC.patch 364
+MD5 84d74457f9d086a1dcf107227314474c files/digest-gaim-otr-2.0.2 66
+MD5 a0bdb06dbcd01bf190eb4e3caa0ec1ec files/digest-gaim-otr-3.0.0 66
diff --git a/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild b/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild
index 725962249f28..78b87a5b02e4 100644
--- a/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild,v 1.1 2005/01/21 14:49:59 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -16,11 +16,19 @@ IUSE=""
 DEPEND="net-libs/libotr
 	>=net-im/gaim-1.1.0"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#fix bug #80405
+	epatch ${FILESDIR}/gaim-otr-1.0.3-fPIC.patch
+}
+
 src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild b/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild
index f510846c900b..e5c20e59bbae 100644
--- a/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild,v 1.1 2005/02/10 20:33:46 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -20,7 +20,7 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild b/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild
index 58f304f9db34..42aa97e97744 100644
--- a/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild,v 1.1 2005/02/24 18:38:29 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~sparc"
 IUSE=""
 
 DEPEND=">=net-libs/libotr-2.0.1
@@ -20,10 +20,10 @@ src_compile() {
 	strip-flags
 	replace-flags -O? -O2
 
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
 	make install DESTDIR=${D} || die "Install failed"
-	dodoc COPYING ChangeLog README
+	dodoc COPYING Changelog README
 }
diff --git a/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild b/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild
index cb249bc02174..1db9cc758727 100644
--- a/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild,v 1.1 2005/05/17 14:12:24 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=net-libs/libotr-2.0.2
@@ -21,7 +21,7 @@ src_compile() {
 	replace-flags -O? -O2
 
 	econf || die "econf failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/x11-plugins/gaim-otr/gaim-otr-3.0.0.ebuild b/x11-plugins/gaim-otr/gaim-otr-3.0.0.ebuild
index 129317d73b36..180b90561ecb 100644
--- a/x11-plugins/gaim-otr/gaim-otr-3.0.0.ebuild
+++ b/x11-plugins/gaim-otr/gaim-otr-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-3.0.0.ebuild,v 1.1 2005/11/14 06:12:04 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-3.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
diff --git a/x11-plugins/gaim-otr/metadata.xml b/x11-plugins/gaim-otr/metadata.xml
index 04ee15b1638d..3e2b4181f5be 100644
--- a/x11-plugins/gaim-otr/metadata.xml
+++ b/x11-plugins/gaim-otr/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-    <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gaim-rhythmbox/ChangeLog b/x11-plugins/gaim-rhythmbox/ChangeLog
index e57dc22a8a2d..7f67df44b2dd 100644
--- a/x11-plugins/gaim-rhythmbox/ChangeLog
+++ b/x11-plugins/gaim-rhythmbox/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for x11-plugins/gaim-rhythmbox
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-rhythmbox/ChangeLog,v 1.1 2004/08/09 12:18:28 rizzo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-rhythmbox/ChangeLog,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
+
+  19 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-rhythmbox-1.0.0.1.ebuild:
+  Stable on sparc
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gaim-rhythmbox-1.0.0.1.ebuild:
+  Stable on ppc.
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-rhythmbox-1.0.0.1.ebuild:
+  Gimme ~sparc
+
+  19 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  gaim-rhythmbox-1.0.0.1.ebuild:
+  Multilib fix, stable on amd64.
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -gaim-rhythmbox-0.81.3.ebuild,
+  -gaim-rhythmbox-0.82.1.ebuild, gaim-rhythmbox-1.0.0.1.ebuild:
+  Stable on x86, pruning old versions
+
+*gaim-rhythmbox-1.0.0.1 (03 Oct 2004)
+
+  03 Oct 2004; Philip Walls <malverian@gentoo.org>
+  +gaim-rhythmbox-1.0.0.1.ebuild:
+  Version bump, unstable on amd64
+
+*gaim-rhythmbox-0.82.1 (09 Sep 2004)
+
+  09 Sep 2004; Don Seiler <rizzo@gentoo.org> +gaim-rhythmbox-0.82.1.ebuild:
+  Version bump
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gaim-rhythmbox-0.81.3.ebuild:
+  Masked gaim-rhythmbox-0.81.3.ebuild stable for ppc
+
+  29 Aug 2004; David Holm <dholm@gentoo.org> gaim-rhythmbox-0.81.3.ebuild:
+  Added to ~ppc.
 
 *gaim-rhythmbox-0.81.3 (09 Aug 2004)
 
diff --git a/x11-plugins/gaim-rhythmbox/Manifest b/x11-plugins/gaim-rhythmbox/Manifest
index 6d9549d9bc23..9bb465d450bd 100644
--- a/x11-plugins/gaim-rhythmbox/Manifest
+++ b/x11-plugins/gaim-rhythmbox/Manifest
@@ -1,3 +1,14 @@
-MD5 c1a2d7f113e28668f770c363bd5e761f metadata.xml 224
-MD5 0a7f5cf4dc00be9d992614f8b08bc19b gaim-rhythmbox-0.81.3.ebuild 711
-MD5 51106dd3e9f0ce3cfffe1d4c56b454b2 files/digest-gaim-rhythmbox-0.81.3 73
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+MD5 bf6d7a2d65ea66aad4dc2508c668f99b gaim-rhythmbox-1.0.0.1.ebuild 820
+MD5 c5f153995591504f14714cfb23f847d5 ChangeLog 1533
+MD5 138fc7668a6717f9cc9d44d9c167897b files/digest-gaim-rhythmbox-1.0.0.1 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDBd7LKRy60XGEcJIRAiChAJ4mHXyo6c/1OEZLslIBq4wNQGcs4ACdGgmo
+0DmD8MRdceohaSZk+25JEn0=
+=gb1+
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gaim-rhythmbox/gaim-rhythmbox-1.0.0.1.ebuild b/x11-plugins/gaim-rhythmbox/gaim-rhythmbox-1.0.0.1.ebuild
index 274a4210ded8..11a967da4431 100644
--- a/x11-plugins/gaim-rhythmbox/gaim-rhythmbox-1.0.0.1.ebuild
+++ b/x11-plugins/gaim-rhythmbox/gaim-rhythmbox-1.0.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-rhythmbox/gaim-rhythmbox-1.0.0.1.ebuild,v 1.1 2004/10/03 20:52:11 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-rhythmbox/gaim-rhythmbox-1.0.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
 inherit debug
 
@@ -12,12 +12,18 @@ GAIM_API="1.0.0"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND=">=net-im/gaim-${GAIM_API}
 	media-sound/rhythmbox"
 
+src_unpack() {
+	unpack ${A}
+	sed -i -e 's:--variable=prefix`/lib:--variable=libdir`:' \
+		${S}/configure{.ac,} || die "sed failed"
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
diff --git a/x11-plugins/gaim-rhythmbox/metadata.xml b/x11-plugins/gaim-rhythmbox/metadata.xml
index e81d825904df..3e2b4181f5be 100644
--- a/x11-plugins/gaim-rhythmbox/metadata.xml
+++ b/x11-plugins/gaim-rhythmbox/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-  <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gaim-xmms-remote/ChangeLog b/x11-plugins/gaim-xmms-remote/ChangeLog
index dd4d06c1ce3b..41b6ccbe9c32 100644
--- a/x11-plugins/gaim-xmms-remote/ChangeLog
+++ b/x11-plugins/gaim-xmms-remote/ChangeLog
@@ -1,6 +1,99 @@
 # ChangeLog for x11-plugins/gaim-xmms-remote
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/ChangeLog,v 1.1 2004/03/26 03:10:59 rizzo Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+*gaim-xmms-remote-1.8 (29 Oct 2004)
+
+  29 Oct 2004; Don Seiler <rizzo@gentoo.org> +gaim-xmms-remote-1.8.ebuild:
+  Version bump
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -gaim-xmms-remote-1.5.ebuild,
+  -gaim-xmms-remote-1.6.ebuild, gaim-xmms-remote-1.7.ebuild:
+  Stable on x86, pruning old versions
+
+  04 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gaim-xmms-remote-1.7.ebuild:
+  Stable on sparc to support gaim 1.0.0
+
+*gaim-xmms-remote-1.7 (18 Sep 2004)
+
+  18 Sep 2004; Don Seiler <rizzo@gentoo.org> +gaim-xmms-remote-1.7.ebuild:
+  Version bump
+
+*gaim-xmms-remote-1.6 (09 Sep 2004)
+
+  09 Sep 2004; Don Seiler <rizzo@gentoo.org> gaim-xmms-remote-1.5.ebuild,
+  +gaim-xmms-remote-1.6.ebuild:
+  Version bump, thanks to amuraco for notice.  Closes Bug #63353
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gaim-xmms-remote-1.5.ebuild:
+  Masked gaim-xmms-remote-1.5.ebuild stable for ppc
+
+  26 Aug 2004; Don Seiler <rizzo@gentoo.org> -gaim-xmms-remote-1.4.ebuild,
+  gaim-xmms-remote-1.5.ebuild:
+  Stable on x86, and working with gaim-0.82
+
+*gaim-xmms-remote-1.5 (08 Aug 2004)
+
+  08 Aug 2004; Don Seiler <rizzo@gentoo.org> +gaim-xmms-remote-1.5.ebuild:
+  Version bump
+
+*gaim-xmms-remote-1.4-r1 (06 Aug 2004)
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> +files/gxr-1.4-gaim-0.81.patch,
+  +gaim-xmms-remote-1.4-r1.ebuild:
+  Patch from Stu Tomlinson for gaim-0.81
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> gaim-xmms-remote-1.4.ebuild:
+  Stable on x86, only works with gaim-0.80
+
+*gaim-xmms-remote-1.4 (19 Jul 2004)
+
+  19 Jul 2004; Don Seiler <rizzo@gentoo.org> +gaim-xmms-remote-1.4.ebuild:
+  Version bump
+
+  06 Jul 2004; Don Seiler <rizzo@gentoo.org> gaim-xmms-remote-1.3.ebuild:
+  Marking stable in x86
+
+  03 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gaim-xmms-remote-1.3.ebuild:
+  Added ~amd64 ~sparc
+
+  03 Jul 2004; Don Seiler <rizzo@gentoo.org> gaim-xmms-remote-1.1.ebuild,
+  gaim-xmms-remote-1.3.ebuild:
+  Updated homepage. Thanks to Daniel Westermann-Clark for pointing out change.
+  Closes Bug #55983
+
+  28 Jun 2004; Don Seiler <rizzo@gentoo.org> -gaim-xmms-remote-1.0.ebuild,
+  -gaim-xmms-remote-1.2.ebuild:
+  Removing old files for gaim pruning
+
+*gaim-xmms-remote-1.3 (25 Jun 2004)
+
+  25 Jun 2004; Don Seiler <rizzo@gentoo.org> +gaim-xmms-remote-1.3.ebuild:
+  Version bump
+
+  20 Jun 2004; Ian Leitch <port001@gentoo.org> gaim-xmms-remote-1.0.ebuild,
+  gaim-xmms-remote-1.1.ebuild, gaim-xmms-remote-1.2.ebuild:
+  No need to set S
+
+*gaim-xmms-remote-1.2 (31 May 2004)
+
+  31 May 2004; Don Seiler <rizzo@gentoo.org>; gaim-xmms-remote-1.1.ebuild,
+  +gaim-xmms-remote-1.2.ebuild:
+  Version bump
+
+  26 Apr 2004; David Holm <dholm@gentoo.org> gaim-xmms-remote-1.1.ebuild:
+  Added to ~ppc.
+
+*gaim-xmms-remote-1.1 (25 Apr 2004)
+
+  25 Apr 2004; Don Seiler <rizzo@gentoo.org>; +gaim-xmms-remote-1.1.ebuild:
+  Version bump
+
+  05 Apr 2004; Don Seiler <rizzo@gentoo.org>; gaim-xmms-remote-1.0.ebuild:
+  Works fine with 0.76
 
 *gaim-xmms-remote-1.0 (25 Mar 2004)
 
diff --git a/x11-plugins/gaim-xmms-remote/Manifest b/x11-plugins/gaim-xmms-remote/Manifest
index b561c6605287..a6a4b5fd4dda 100644
--- a/x11-plugins/gaim-xmms-remote/Manifest
+++ b/x11-plugins/gaim-xmms-remote/Manifest
@@ -1,2 +1,6 @@
-MD5 e5be6ed2a028bb35c915526ed3aaa2ad gaim-xmms-remote-1.0.ebuild 571
-MD5 d59f874a4e1790cff7ae95e5a559caf4 files/digest-gaim-xmms-remote-1.0 72
+MD5 90e8793fa9b58c50848ddba62a4bfe92 ChangeLog 3328
+MD5 51ce63f436d9a4fe08f9cd9bfd705bfd gaim-xmms-remote-1.8.ebuild 641
+MD5 9a401f93c6c5595dde24fabcf9d0c4e2 gaim-xmms-remote-1.7.ebuild 639
+MD5 8012f357c55907c76a64d35814c253bb metadata.xml 509
+MD5 902a47c1dce6fa00ed5442157cab4d96 files/digest-gaim-xmms-remote-1.8 72
+MD5 0a550e0b47217c963140043369d2c6c5 files/digest-gaim-xmms-remote-1.7 72
diff --git a/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.7.ebuild b/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.7.ebuild
index cc58d6fc8b88..cb0246fc11cf 100644
--- a/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.7.ebuild
+++ b/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.7.ebuild,v 1.1 2004/09/18 15:00:33 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.7.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 inherit debug
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/guifications/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc sparc ~amd64"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.0
diff --git a/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.8.ebuild b/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.8.ebuild
index 49e08634aab2..916811612a01 100644
--- a/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.8.ebuild
+++ b/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.8.ebuild,v 1.1 2004/10/29 20:08:59 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.8.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 inherit debug
 
diff --git a/x11-plugins/gaim-xmms-remote/metadata.xml b/x11-plugins/gaim-xmms-remote/metadata.xml
index 1551d9fc03f4..630ccf8e6996 100644
--- a/x11-plugins/gaim-xmms-remote/metadata.xml
+++ b/x11-plugins/gaim-xmms-remote/metadata.xml
@@ -2,8 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 <longdescription>Gaim XMMS Remote (known as gxr from here on) is a Gaim plugin that lets you control XMMS from within gaim. GXR lets you play, pause, and stop the current song. Aswell as navigate to the next and previous song in your playlist. It will also display your playlist as a submenu if you have that preference turned on.</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/gaimosd/ChangeLog b/x11-plugins/gaimosd/ChangeLog
index f782dca536f9..a87274a40fab 100644
--- a/x11-plugins/gaimosd/ChangeLog
+++ b/x11-plugins/gaimosd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-plugins/gaimosd
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaimosd/ChangeLog,v 1.1 2004/09/20 15:52:10 rizzo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaimosd/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+  18 Feb 2005; Don Seiler <rizzo@gentoo.org> gaimosd-1.0.0.ebuild:
+  Patch to remove some extraneous printf() lines. Closes bug #82118, thanks
+  Manuel Sabban.
+
+  13 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gaimosd-1.0.0.ebuild:
+  Added to ~amd64.
+
+  08 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> gaimosd-1.0.0.ebuild:
+  Added to ~ppc.
 
 *gaimosd-1.0.0 (20 Sep 2004)
 
diff --git a/x11-plugins/gaimosd/Manifest b/x11-plugins/gaimosd/Manifest
index a8774ac725b5..dd5b1d02e50b 100644
--- a/x11-plugins/gaimosd/Manifest
+++ b/x11-plugins/gaimosd/Manifest
@@ -1,2 +1,5 @@
-MD5 c24a419961bbb8b9c964bb7027aafe6d gaimosd-1.0.0.ebuild 562
+MD5 b6fb2e82692d7e2481111eaf2a714d8e ChangeLog 719
+MD5 d8b416b880ea46d5bb83fcaf537612a8 gaimosd-1.0.0.ebuild 835
+MD5 c0faf0b1810affab2e94a1a23f8533ab metadata.xml 370
 MD5 e562a7f08384757d72348e1590ae7ba6 files/digest-gaimosd-1.0.0 65
+MD5 bf766281a9286c3ad2c0fc74ec0c3e45 files/gaimosd-quiet.diff 718
diff --git a/x11-plugins/gaimosd/gaimosd-1.0.0.ebuild b/x11-plugins/gaimosd/gaimosd-1.0.0.ebuild
index 5d9d9ea7350f..eba262c6f14b 100644
--- a/x11-plugins/gaimosd/gaimosd-1.0.0.ebuild
+++ b/x11-plugins/gaimosd/gaimosd-1.0.0.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaimosd/gaimosd-1.0.0.ebuild,v 1.1 2004/09/20 15:52:10 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaimosd/gaimosd-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Gaim OSD is an implementation of the XOSD library, allowing Gaim to display several notification messages."
 HOMEPAGE="http://gaimosd.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
-SLOT="0"
-KEYWORDS="~x86"
 IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
 
 DEPEND=">=net-im/gaim-1.0.0
-		x11-libs/xosd"
-#RDEPEND=""
+	x11-libs/xosd"
 
-#S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gaimosd-quiet.diff
+}
 
 src_compile() {
-	econf || die
+	econf --enable-customized-buddies --enable-customized-conversations || die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	#einstall || die
-
+	make DESTDIR="${D}" install || die
 	dodoc README TODO
 }
diff --git a/x11-plugins/gkacpi/ChangeLog b/x11-plugins/gkacpi/ChangeLog
index 00cb075a1c21..679d54655cb1 100644
--- a/x11-plugins/gkacpi/ChangeLog
+++ b/x11-plugins/gkacpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gkacpi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/ChangeLog,v 1.1 2002/12/16 23:23:06 bass Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  19 Jun 2004; <pyrania@gentoo.org> gkacpi-0.5.ebuild:
+  Removed DEPEND.
+
+  07 Oct 2003; Martin Holzer <mholzer@gentoo.org> gkacpi-0.5.ebuild:
+  changed depend to gkrellm fixed version. Closes #27060.
 
 *gkacpi-0.5 (16 Dec 2002)
 
diff --git a/x11-plugins/gkacpi/Manifest b/x11-plugins/gkacpi/Manifest
index e69de29bb2d1..b3eb98c37479 100644
--- a/x11-plugins/gkacpi/Manifest
+++ b/x11-plugins/gkacpi/Manifest
@@ -0,0 +1,3 @@
+MD5 53897091c52f77d8dc2596fa4ffb8ae6 gkacpi-0.5.ebuild 615
+MD5 2c8ba4c5ccfbf0c619596aa201c932d2 ChangeLog 532
+MD5 b647f3c9cd8806f4fcddbf0aa2019849 files/digest-gkacpi-0.5 61
diff --git a/x11-plugins/gkacpi/gkacpi-0.5.ebuild b/x11-plugins/gkacpi/gkacpi-0.5.ebuild
index 66653cd69cf4..3e5042699c8e 100644
--- a/x11-plugins/gkacpi/gkacpi-0.5.ebuild
+++ b/x11-plugins/gkacpi/gkacpi-0.5.ebuild
@@ -1,14 +1,13 @@
-# 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-plugins/gkacpi/gkacpi-0.5.ebuild,v 1.1 2002/12/16 23:23:06 bass Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/gkacpi-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
+IUSE=""
 DESCRIPTION="ACPI monitor for Gkrellm"
 SRC_URI="http://uname.dyndns.org/~uname/files/gkacpi/${P}.tar.gz"
 HOMEPAGE="http://uname.dyndns.org/~uname/software.php"
 LICENSE="GPL-2"
-DEPEND="app-admin/gkrellm"
-RDEPEND="${DEPEND}"
+RDEPEND="=app-admin/gkrellm-2*"
 KEYWORDS="x86"
 SLOT="0"
 
@@ -19,6 +18,6 @@ src_compile() {
 src_install () {
 	insinto /usr/lib/gkrellm2/plugins
 	doins gkacpi.so
-	
+
 	dodoc AUTHORS ChangeLog COPYING INSTALL README
 }
diff --git a/x11-plugins/gkrellaclock/ChangeLog b/x11-plugins/gkrellaclock/ChangeLog
index 8507305fbd78..0db82355e2f5 100644
--- a/x11-plugins/gkrellaclock/ChangeLog
+++ b/x11-plugins/gkrellaclock/ChangeLog
@@ -1,7 +1,49 @@
 # ChangeLog for x11-plugins/gkrellaclock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/ChangeLog,v 1.1 2002/10/16 22:30:29 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
+  06 May 2005; Sven Wegener <swegener@gentoo.org> gkrellaclock-0.3.2.ebuild,
+  gkrellaclock-0.3.2.1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellaclock-0.3.2.1.ebuild:
+  Stable on amd64.
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gkrellaclock-0.3.2.1.ebuild:
+  Stable on alpha.
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gkrellaclock-0.3.2.1.ebuild:
+  Stable on sparc
+
+  06 Nov 2004; <pyrania@gentoo.org> gkrellaclock-0.3.2.1.ebuild:
+  Marked stable on x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellaclock-0.3.2.1.ebuild:
+  Masked gkrellaclock-0.3.2.1.ebuild stable for ppc
+
+  09 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellaclock-0.3.2.1.ebuild:
+  Marked ~amd64.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> gkrellaclock-0.3.2.ebuild:
+  Stable on sparc.
+
+*gkrellaclock-0.3.2.1 (13 Jun 2004)
+
+  13 Jun 2004; <pyrania@gentoo.org> +gkrellaclock-0.3.2.1.ebuild:
+  Version bumo. Closing bug #52741.
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellaclock-0.3.2.ebuild:
+  stable on alpha
+
+  07 Oct 2003; Martin Holzer <mholzer@gentoo.org> gkrellaclock-0.2.1.ebuild:
+  Changed depend to gkrellm fixed version. Closes #27060.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellaclock-0.3.2 (16 Oct 2002)
 
   16 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
diff --git a/x11-plugins/gkrellaclock/Manifest b/x11-plugins/gkrellaclock/Manifest
index e69de29bb2d1..25747f10db06 100644
--- a/x11-plugins/gkrellaclock/Manifest
+++ b/x11-plugins/gkrellaclock/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f80a130f0bb6dffbb7e9f76f1bca0737 gkrellaclock-0.3.2.ebuild 694
+MD5 ab6b8b81abe52ca78c664db40a0bcfda gkrellaclock-0.3.2.1.ebuild 729
+MD5 37079d64cb1ad077e6cd9b5f56ec7967 gkrellaclock-0.2.1.ebuild 686
+MD5 c39763118b029520628025918ee4e835 ChangeLog 2015
+MD5 0ed63877aea75f4150337326535bdf77 files/digest-gkrellaclock-0.2.1 68
+MD5 c9dbdb43a9e9c1479a59d00e6f856886 files/digest-gkrellaclock-0.3.2 68
+MD5 8e15775e4d6f6afcb9a0c6a71ca9029a files/digest-gkrellaclock-0.3.2.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCerdLI1lqEGTUzyQRAvuQAKDet1bvkCBP8AW/h/p9AVP5p1bXYwCfSsNW
+3KhGJxPnk0Db9etJ1QcS62Y=
+=S8G6
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.2.1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.2.1.ebuild
index dcd24c9f8b08..0fe4cf62eb5d 100644
--- a/x11-plugins/gkrellaclock/gkrellaclock-0.2.1.ebuild
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.2.1.ebuild
@@ -1,17 +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-plugins/gkrellaclock/gkrellaclock-0.2.1.ebuild,v 1.1 2002/10/16 22:30:29 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/gkrellaclock-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${P/a/A}
 DESCRIPTION="Nice analog clock for GKrellM2"
 SRC_URI="http://www.geocities.com/m_muthukumar/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/m_muthukumar/gkrellaclock.html"
 
-DEPEND=">=app-admin/gkrellm-1.2*"	
+DEPEND="=app-admin/gkrellm-1.2*"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~sparc64"
+KEYWORDS="x86 ~sparc"
 
 src_compile() {
 	export CFLAGS="${CFLAGS/-O?/}"
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild
index 6303f82e4171..94055c17a02f 100644
--- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild,v 1.1 2004/06/13 04:21:48 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+inherit multilib
 
 IUSE=""
 S=${WORKDIR}/${P/a/A}
@@ -8,11 +10,11 @@ DESCRIPTION="Nice analog clock for GKrellM2"
 SRC_URI="http://www.geocities.com/m_muthukumar/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/m_muthukumar/gkrellaclock.html"
 
-DEPEND=">=app-admin/gkrellm-2*"
+DEPEND=">=app-admin/gkrellm-2"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="x86 sparc alpha ppc amd64"
 
 src_compile() {
 	export CFLAGS="${CFLAGS/-O?/}"
@@ -20,7 +22,7 @@ src_compile() {
 }
 
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellaclock.so
 	dodoc README ChangeLog
 }
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.ebuild
index 46a2672fa58b..4ecab8eb3879 100644
--- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.ebuild
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.ebuild
@@ -1,17 +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-plugins/gkrellaclock/gkrellaclock-0.3.2.ebuild,v 1.1 2002/10/16 22:30:29 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${P/a/A}
 DESCRIPTION="Nice analog clock for GKrellM2"
 SRC_URI="http://www.geocities.com/m_muthukumar/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/m_muthukumar/gkrellaclock.html"
 
-DEPEND=">=app-admin/gkrellm-2*"	
+DEPEND=">=app-admin/gkrellm-2"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~sparc64"
+KEYWORDS="x86 sparc alpha ppc"
 
 src_compile() {
 	export CFLAGS="${CFLAGS/-O?/}"
diff --git a/x11-plugins/gkrellflynn/ChangeLog b/x11-plugins/gkrellflynn/ChangeLog
index c86d6681d72f..dfde2370de06 100644
--- a/x11-plugins/gkrellflynn/ChangeLog
+++ b/x11-plugins/gkrellflynn/ChangeLog
@@ -1,9 +1,37 @@
 # ChangeLog for x11-plugins/gkrellflynn
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/ChangeLog,v 1.1 2002/10/31 14:07:32 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gkrellflynn-0.7.ebuild:
+  Mark 0.7 stable on alpha
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellflynn-0.6.ebuild:
+  Stable on amd64.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellflynn-0.7.ebuild:
+  multilib fixes closes bug #88539
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellflynn-0.7.ebuild:
+  Masked gkrellflynn-0.7.ebuild stable for ppc
+
+*gkrellflynn-0.7 (22 Jun 2004)
+
+  22 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrellflynn-0.7.ebuild,
+  metadata.xml:
+  Version bumped.
+
+  19 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> gkrellflynn-0.6.ebuild:
+  marked ~amd64
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellflynn-0.6.ebuild:
+  stable on alpha
 
 *gkrellflynn-0.6 (31 Oct 2002)
 
+  14 Mar 2003; Jason Wever <weeve@gentoo.org> gkrellflynn-0.6.ebuild:
+  Added ~sparc to keywords.
+
   31 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellflynn-0.6.ebuild
   ChangeLog files/digest-gkrellflynn-0.6 :
 
diff --git a/x11-plugins/gkrellflynn/Manifest b/x11-plugins/gkrellflynn/Manifest
index e69de29bb2d1..474cdb7ee029 100644
--- a/x11-plugins/gkrellflynn/Manifest
+++ b/x11-plugins/gkrellflynn/Manifest
@@ -0,0 +1,6 @@
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 8ad2a0eb523094464247110615eccdb2 gkrellflynn-0.7.ebuild 1001
+MD5 92cf68058e997e72014c79359a082a7d ChangeLog 1407
+MD5 022ea515f08cd7d00e1de64ce70689af gkrellflynn-0.6.ebuild 910
+MD5 2eb583a49bc9f3e97d018b606b216e09 files/digest-gkrellflynn-0.7 66
+MD5 ae2f270e3dab3e54a727b08293af3ae8 files/digest-gkrellflynn-0.6 66
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
index edb2f43b0782..1c5f85502522 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
@@ -1,12 +1,15 @@
-# Copyright 2002, Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild,v 1.1 2002/10/31 14:07:32 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
+IUSE=""
 HOMEPAGE="http://horus.comlab.uni-rostock.de/flynn/"
 SRC_URI="http://horus.comlab.uni-rostock.de/flynn/${P}.tar.gz"
 DESCRIPTION="A funny GKrellM (1 or 2) load monitor (for Doom(tm) fans)"
-
+KEYWORDS="x86 ~sparc alpha amd64 ppc"
 DEPEND="app-admin/gkrellm"
+SLOT="0"
+LICENSE="GPL-2"
 
 src_compile() {
 
@@ -36,4 +39,4 @@ src_install() {
 	fi
 
 	dodoc INSTALL Changelog README COPYING AUTHORS
-}		
+}
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
index 635e552bff59..e754b8cd8c82 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild,v 1.1 2004/06/22 14:10:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+inherit multilib
 
 IUSE=""
 HOMEPAGE="http://horus.comlab.uni-rostock.de/flynn/"
 SRC_URI="http://horus.comlab.uni-rostock.de/flynn/${P}.tar.gz"
 DESCRIPTION="A funny GKrellM (1 or 2) load monitor (for Doom(tm) fans)"
-KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~ppc"
+KEYWORDS="alpha ~amd64 ppc ~sparc ~x86"
 DEPEND="app-admin/gkrellm"
 SLOT="0"
 LICENSE="GPL-2"
 
 src_compile() {
+	# Clean out precompiled plugin first
+	make clean
+
 	if [ -f /usr/bin/gkrellm ]
 	then
 		make gkrellm
@@ -26,13 +31,13 @@ src_compile() {
 src_install() {
 	if [ -f /usr/bin/gkrellm ]
 	then
-		exeinto /usr/lib/gkrellm/plugins
+		exeinto /usr/$(get_libdir)/gkrellm/plugins
 		doexe gkrellflynn.so
 	fi
 
 	if [ -f /usr/bin/gkrellm2 ]
 	then
-		exeinto /usr/lib/gkrellm2/plugins ;
+		exeinto /usr/$(get_libdir)/gkrellm2/plugins ;
 		doexe gkrellflynn.so
 	fi
 
diff --git a/x11-plugins/gkrellkam/ChangeLog b/x11-plugins/gkrellkam/ChangeLog
index bf67ee4ff79d..74f7478e3bbc 100644
--- a/x11-plugins/gkrellkam/ChangeLog
+++ b/x11-plugins/gkrellkam/ChangeLog
@@ -1,9 +1,27 @@
 # ChangeLog for x11-plugins/gkrellkam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
-*gkrellkam-0.3.4 (2 Apr 2002)
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellkam-2.0.0.ebuild:
+  multilib fixes
+
+  25 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> gkrellkam-2.0.0.ebuild:
+  Marked stable on amd64.
+
+  09 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellkam-2.0.0.ebuild:
+  Marked ~amd64.
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellkam-2.0.0.ebuild:
+  stable on alpha
+
+*gkrellkam-2.0.0 (08 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
+*gkrellkam-0.3.4 (2 Apr 2002)
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> gkrellkam-0.3.4.ebuild
   files/digest-gkrellkam-0.3.4 ChangeLog * :
 
diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
index e69de29bb2d1..f0dab8418344 100644
--- a/x11-plugins/gkrellkam/Manifest
+++ b/x11-plugins/gkrellkam/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ddda4c219caee1358451d7e51c2b49f0 gkrellkam-2.0.0.ebuild 690
+MD5 267184392da245820e45db0a2c39bd0b ChangeLog 1546
+MD5 18603b8a8e2fbdae13a37879d96da704 gkrellkam-0.3.4.ebuild 639
+MD5 003cc4de0a739a28af21074bff0b63cd files/digest-gkrellkam-0.3.4 66
+MD5 92da7650bdbd91e8256c259310a1efb3 files/digest-gkrellkam-2.0.0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCcAG62G5bA0cA/ScRAidhAJ9wdhMFYPYWwd2A51Stgf7Vcb48tQCcCPk1
+q1iUTNVIUWCU2IzQKir0kXY=
+=y8Rk
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild b/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild
index 0323fea7d26c..a213efa9ff10 100644
--- a/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-0.3.4.ebuild
@@ -1,22 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
-# 16.Sept.2001 23.35 CET
+# Copyright 1999-2005 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 MY_P=${P/-/_}
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="a Image-Watcher-Plugin for Gkrellm."
 SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellkam.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc"
 
-DEPEND=">=app-admin/gkrellm-1.2.11"
-
-src_compile() {
-	emake || die
-}
+DEPEND="=app-admin/gkrellm-1.2*"
 
 src_install () {
 	exeinto /usr/lib/gkrellm/plugins
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
index cb11ecdaedac..1b0edd3ddc7c 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # 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.1 2002/11/08 22:03:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+inherit multilib
 
 MY_P=${P/-/_}
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="an Image-Watcher-Plugin for GKrellM2."
 SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellkam.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 DEPEND="=app-admin/gkrellm-2*"
 
-src_compile() {
-	emake || die
-}
-
 src_install () {
-	exeinto /usr/lib/gkrellm2/plugins
+	exeinto /usr/$(get_libdir)/gkrellm2/plugins
 	doexe gkrellkam2.so
 
 	doman gkrellkam-list.5
diff --git a/x11-plugins/gkrellm-alltraxclock/ChangeLog b/x11-plugins/gkrellm-alltraxclock/ChangeLog
index 0ef494886079..cd1298836cd7 100644
--- a/x11-plugins/gkrellm-alltraxclock/ChangeLog
+++ b/x11-plugins/gkrellm-alltraxclock/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/gkrellm-alltraxclock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-alltraxclock/ChangeLog,v 1.1 2002/10/16 20:59:22 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-alltraxclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellm-alltraxclock-0.3 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellm-alltraxclock-0.3.ebuild files/digest-gkrellm-alltraxclock-0.3 :
+
+  Version bump.
 
 *gkrellm-alltraxclock-0.2 (16 Oct 2002)
 
diff --git a/x11-plugins/gkrellm-alltraxclock/Manifest b/x11-plugins/gkrellm-alltraxclock/Manifest
index 26ffce35c39a..7dccf88afed6 100644
--- a/x11-plugins/gkrellm-alltraxclock/Manifest
+++ b/x11-plugins/gkrellm-alltraxclock/Manifest
@@ -1,5 +1,5 @@
-MD5 d8aedc794977cd31ce8a6825fbba7227 ChangeLog 979
-MD5 5a331b67b46a05869169663bce510bb3 gkrellm-alltraxclock-0.2.ebuild 732
-MD5 ef1e77a33212cf40d732d34ab16ae8be gkrellm-alltraxclock-0.3.ebuild 732
+MD5 1160ae6feb259203291213f73f6663ad gkrellm-alltraxclock-0.3.ebuild 703
+MD5 b3a974290910955fd7d0ef46e54068bc gkrellm-alltraxclock-0.2.ebuild 700
+MD5 62126b7cce4727f8c8658fcbbe83b006 ChangeLog 972
 MD5 a3b8a849b48fa90265c3c29f40f764b9 files/digest-gkrellm-alltraxclock-0.2 66
 MD5 62ec10222e6db3111019e4064b93465d files/digest-gkrellm-alltraxclock-0.3 66
diff --git a/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.2.ebuild b/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.2.ebuild
index d399521709ce..ff5460b0b30b 100644
--- a/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.2.ebuild
+++ b/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.2.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.2.ebuild,v 1.1 2002/10/16 20:59:22 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/gkrellm-}
 S=${WORKDIR}/${MY_P}
-DESCRIPTION="A Gkrellm plugin that displays an analog clock"
+DESCRIPTION="A GKrellM (not GKrellM2) plugin that displays an analog clock"
 SRC_URI="http://perso.wanadoo.fr/alltrax/${MY_P}.tar.gz"
 HOMEPAGE="http://perso.wanadoo.fr/alltrax/alltraxclock.html"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc "
 
 DEPEND="=app-admin/gkrellm-1.2*
 	=x11-libs/gtk+-1.2*
 	>=media-libs/imlib-1.9.10-r1"
 
-src_compile() {
-	emake || die
-}
-
 src_install () {
 	exeinto /usr/lib/gkrellm/plugins
 	doexe alltraxclock.so
diff --git a/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.3.ebuild b/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.3.ebuild
index 5b8f28286c6c..02a64ff922fb 100644
--- a/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.3.ebuild
+++ b/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.3.ebuild,v 1.1 2002/10/16 21:12:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-alltraxclock/gkrellm-alltraxclock-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/gkrellm-}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A GKrellM (not GKrellM2) plugin that displays an analog clock"
@@ -9,16 +10,12 @@ SRC_URI="http://perso.wanadoo.fr/alltrax/${MY_P}.tar.gz"
 HOMEPAGE="http://perso.wanadoo.fr/alltrax/alltraxclock.html"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc ppc"
 
 DEPEND="=app-admin/gkrellm-1.2*
 	=x11-libs/gtk+-1.2*
 	>=media-libs/imlib-1.9.10-r1"
 
-src_compile() {
-	emake || die
-}
-
 src_install () {
 	exeinto /usr/lib/gkrellm/plugins
 	doexe alltraxclock.so
diff --git a/x11-plugins/gkrellm-bfm/ChangeLog b/x11-plugins/gkrellm-bfm/ChangeLog
index 0753b51749d0..f05f431034be 100644
--- a/x11-plugins/gkrellm-bfm/ChangeLog
+++ b/x11-plugins/gkrellm-bfm/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for x11-plugins/gkrellm-bfm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bfm/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bfm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellm-bfm-0.5.1 (19 Feb 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellm-bfm/Manifest b/x11-plugins/gkrellm-bfm/Manifest
index 7d46fbb98e96..8b59d31cc1f9 100644
--- a/x11-plugins/gkrellm-bfm/Manifest
+++ b/x11-plugins/gkrellm-bfm/Manifest
@@ -1,3 +1,3 @@
-MD5 96093372625ad09850ee76ad1384231d ChangeLog 653
-MD5 0ff1f302130d5441d4c440a725d787d0 gkrellm-bfm-0.5.1.ebuild 726
+MD5 e91143e52926cf6035890eb4bb2a2072 gkrellm-bfm-0.5.1.ebuild 727
+MD5 636a75e0fb8b0ddeb4e36a390d22eeb4 ChangeLog 646
 MD5 97aa9e47e3f3a9f89671e847d71e5839 files/digest-gkrellm-bfm-0.5.1 61
diff --git a/x11-plugins/gkrellm-bfm/gkrellm-bfm-0.5.1.ebuild b/x11-plugins/gkrellm-bfm/gkrellm-bfm-0.5.1.ebuild
index ea97f3e8a907..10e67c009be5 100644
--- a/x11-plugins/gkrellm-bfm/gkrellm-bfm-0.5.1.ebuild
+++ b/x11-plugins/gkrellm-bfm/gkrellm-bfm-0.5.1.ebuild
@@ -1,17 +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-plugins/gkrellm-bfm/gkrellm-bfm-0.5.1.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bfm/gkrellm-bfm-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/bfm-${PV}
-DESCRIPTION="A Gkrellm plugin that monitors things on your machine"
+DESCRIPTION="A Gkrellm bubblefishymon plugin that monitors things on your machine"
 SRC_URI="http://pigeond.net/bfm/bfm-${PV}.tar.bz2"
 HOMEPAGE="http://pigeond.net/bfm/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-	=x11-libs/gtk+-1.2*
+DEPEND="=app-admin/gkrellm-1.2*
 	>=media-libs/imlib-1.9.10-r1"
 
 src_compile() {
diff --git a/x11-plugins/gkrellm-bgchanger/ChangeLog b/x11-plugins/gkrellm-bgchanger/ChangeLog
index 69ade43a9215..13d3e2a61885 100644
--- a/x11-plugins/gkrellm-bgchanger/ChangeLog
+++ b/x11-plugins/gkrellm-bgchanger/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for x11-plugins/gkrellm-bgchanger
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/ChangeLog,v 1.1 2002/12/14 22:47:06 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-bgchanger-0.1.2.ebuild:
+  Mark 0.1.2 stable on alpha
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-bgchanger-0.1.0.ebuild:
+  Stable on amd64.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-bgchanger-0.1.2.ebuild:
+  multilib fixes
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-bgchanger-0.1.0.ebuild:
+  Masked gkrellm-bgchanger-0.1.0.ebuild stable for ppc
+
+*gkrellm-bgchanger-0.1.0 (09 Jul 2004)
+
+  09 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellm-bgchanger-0.1.0.ebuild:
+  Marked ~amd64.
+
+*gkrellm-bgchanger-0.0.9 (18 Jan 2004)
+
+  18 Jan 2004; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-bgchanger-0.0.9.ebuild:
+  Version bumped. Closes 38338
+
+*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>
+  gkrellm-bgchanger-0.0.4-r1.ebuild, gkrellm-bgchanger-0.0.4.ebuild,
+  gkrellm-bgchanger-0.0.8.ebuild:
+  split this up to install a gkrellm and a gkrellm2 version separately. Also
+  note that the gkrellm2 version had a bump. Closes bug #34572 by Spider
+  <spider@gentoo.org>
 
 *gkrellm-bgchanger-0.0.4 (14 Dec 2002)
 
diff --git a/x11-plugins/gkrellm-bgchanger/Manifest b/x11-plugins/gkrellm-bgchanger/Manifest
index e69de29bb2d1..2987d6cf1d5a 100644
--- a/x11-plugins/gkrellm-bgchanger/Manifest
+++ b/x11-plugins/gkrellm-bgchanger/Manifest
@@ -0,0 +1,12 @@
+MD5 23e4f44f9dc7f48b3955aa7afa562df8 gkrellm-bgchanger-0.1.2.ebuild 797
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 cabf00dacdad9f3b3116777c433a0f96 gkrellm-bgchanger-0.0.4-r1.ebuild 750
+MD5 8dc32041078ae147b93df80cd5b8cdc2 ChangeLog 1738
+MD5 a6676364c22e07b8bcb916dcaeb09524 gkrellm-bgchanger-0.1.0.ebuild 767
+MD5 7de90264d9b99bfd592fe92171d93d9b gkrellm-bgchanger-0.0.9.ebuild 760
+MD5 0e3785ed199ca1387385aa8bdebed1b4 gkrellm-bgchanger-0.0.8.ebuild 761
+MD5 6fef03f8c3e46cbc98399f67da5e847f files/digest-gkrellm-bgchanger-0.0.8 69
+MD5 bdad4dc3616d5aabd89e322f3219ac05 files/digest-gkrellm-bgchanger-0.0.4-r1 68
+MD5 790237b61f85b9be44f90057871b0636 files/digest-gkrellm-bgchanger-0.0.9 69
+MD5 b2d1066375450fa477bd730196b9e6e7 files/digest-gkrellm-bgchanger-0.1.2 70
+MD5 cf0d0247faa74ae758e4258365c997e5 files/digest-gkrellm-bgchanger-0.1.0 70
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.4-r1.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.4-r1.ebuild
index c0c4b5f3b453..9ef2c602f88e 100644
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.4-r1.ebuild
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.4-r1.ebuild,v 1.1 2003/12/01 17:44:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="=app-admin/gkrellm-1.2*"
 
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.8.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.8.ebuild
index 4f3c20989d3b..90cdf020e4cb 100644
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.8.ebuild
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.8.ebuild,v 1.1 2003/12/01 17:44:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.8.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.9.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.9.ebuild
index 64183859ffad..56c75400302c 100644
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.9.ebuild
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.9.ebuild,v 1.1 2004/01/18 15:57:23 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.0.9.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
+KEYWORDS="~x86 ppc ~sparc ~alpha"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.0.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.0.ebuild
index d49e2b10ba3b..cb7bc5611c8c 100644
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.0.ebuild
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.0.ebuild,v 1.1 2004/06/22 15:54:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/old/${MY_P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~x86 ppc ~sparc ~alpha amd64"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.2.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.2.ebuild
index 39bd866c1435..5916b86a750c 100644
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.2.ebuild
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.2.ebuild,v 1.1 2005/03/22 18:21:58 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
-IUSE=""
+inherit multilib
 
+IUSE=""
 MY_PN=gkrellmbgchg2
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -13,7 +14,7 @@ SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/old/${MY_P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~sparc ~alpha ~amd64"
+KEYWORDS="alpha ~amd64 ppc ~sparc ~x86"
 
 DEPEND="=app-admin/gkrellm-2*"
 
@@ -22,7 +23,7 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins ${MY_PN/2/}.so
 
 	dodoc ChangeLog README TODO
diff --git a/x11-plugins/gkrellm-console/ChangeLog b/x11-plugins/gkrellm-console/ChangeLog
index ddcd0ba0a4b4..953253e5836b 100644
--- a/x11-plugins/gkrellm-console/ChangeLog
+++ b/x11-plugins/gkrellm-console/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for x11-plugins/gkrellm-console
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-console/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-console/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-console-0.1.2.ebuild:
+  Masked gkrellm-console-0.1.2.ebuild stable for ppc
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org>
+  gkrellm-console-0.1.2.ebuild:
+  Stable on sparc.
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-console-0.1.2.ebuild:
+  stable on alpha
+
+  17 Jul 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-console-0.1.2.ebuild:
+  Marked x86 stable.
+
+*gkrellm-console-0.1.2 (23 Mar 2003)
+
+  26 Mar 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-console-0.1.2.ebuild:
+  Fixed {S}. Closes #18174 and #18156.
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-console-0.1.2.ebuild:
+  Version bumped.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellm-console-0.1 (14 Apr 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellm-console/Manifest b/x11-plugins/gkrellm-console/Manifest
index e69de29bb2d1..7f95479fd230 100644
--- a/x11-plugins/gkrellm-console/Manifest
+++ b/x11-plugins/gkrellm-console/Manifest
@@ -0,0 +1,5 @@
+MD5 c8872ecccb79c95d2b11341dddeae327 ChangeLog 1365
+MD5 0c92049804e2bf4bb4ecfbdfea46ac92 gkrellm-console-0.1.2.ebuild 748
+MD5 3f38dc73b9bd7d1eebfae7ae22cfad69 gkrellm-console-0.1.ebuild 733
+MD5 8fcc7b7e17ede1f047ef5867cb64d235 files/digest-gkrellm-console-0.1 66
+MD5 92eec38ce3738c45221d4d3cf4e93bdf files/digest-gkrellm-console-0.1.2 68
diff --git a/x11-plugins/gkrellm-console/gkrellm-console-0.1.2.ebuild b/x11-plugins/gkrellm-console/gkrellm-console-0.1.2.ebuild
index 953bd412a213..7d7d6c9dc87b 100644
--- a/x11-plugins/gkrellm-console/gkrellm-console-0.1.2.ebuild
+++ b/x11-plugins/gkrellm-console/gkrellm-console-0.1.2.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-console/gkrellm-console-0.1.2.ebuild,v 1.1 2003/03/23 16:38:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-console/gkrellm-console-0.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
+IUSE=""
 MY_P=consolewatch-${PV}
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/gkrellm-${MY_P}
 DESCRIPTION="A GKrellM plugin that shows the users logged into each console"
 SRC_URI="http://gkrellm.luon.net/files/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/consolewatch.phtml"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="=app-admin/gkrellm-1.2*
 	>=media-libs/imlib-1.9.10-r1"
diff --git a/x11-plugins/gkrellm-console/gkrellm-console-0.1.ebuild b/x11-plugins/gkrellm-console/gkrellm-console-0.1.ebuild
index da82ea3c0819..aa5cac677c34 100644
--- a/x11-plugins/gkrellm-console/gkrellm-console-0.1.ebuild
+++ b/x11-plugins/gkrellm-console/gkrellm-console-0.1.ebuild
@@ -1,7 +1,8 @@
-# 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-plugins/gkrellm-console/gkrellm-console-0.1.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-console/gkrellm-console-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
+IUSE=""
 MY_P=consolewatch-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A GKrellM plugin that shows the users logged into each console"
@@ -10,10 +11,9 @@ HOMEPAGE="http://gkrellm.luon.net/consolewatch.phtml"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-	=x11-libs/gtk+-1.2*
+DEPEND="=app-admin/gkrellm-1.2*
 	>=media-libs/imlib-1.9.10-r1"
 
 src_compile() {
diff --git a/x11-plugins/gkrellm-countdown/ChangeLog b/x11-plugins/gkrellm-countdown/ChangeLog
index 3721e1619b8c..577d932f5e06 100644
--- a/x11-plugins/gkrellm-countdown/ChangeLog
+++ b/x11-plugins/gkrellm-countdown/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gkrellm-countdown
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-countdown/ChangeLog,v 1.1 2005/07/02 15:57:11 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-countdown/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+  30 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> gkrellm-countdown-0.1.1.ebuild:
+  Added missing IUSE var...
+
+  03 Jul 2005; David Holm <dholm@gentoo.org> gkrellm-countdown-0.1.1.ebuild:
+  Added to ~ppc.
 
 *gkrellm-countdown-0.1.1 (02 Jul 2005)
 
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index dbfd621b571c..3d7ef5ca52c5 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -1,2 +1,4 @@
-MD5 6c8818519ce67e0a6bae96c43c90184a gkrellm-countdown-0.1.1.ebuild 658
+MD5 7b18feb010f31dd07bdcb8861c480247 gkrellm-countdown-0.1.1.ebuild 655
+MD5 1892cffc803617b30096dbf5e22b66ed ChangeLog 639
+MD5 97ed0d868abde3771195ebf5fac34312 metadata.xml 230
 MD5 21176a0ec04e09afa900454be625e08f files/digest-gkrellm-countdown-0.1.1 74
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.1.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.1.ebuild
index f9b01dc81cdb..86cf035b6428 100644
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.1.ebuild
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.1.ebuild,v 1.1 2005/07/02 15:57:11 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A simple countdown clock for GKrellM2"
 SRC_URI="http://www.cise.ufl.edu/~jcjones/src/${P}.tar.gz"
 HOMEPAGE="http://www.cise.ufl.edu/~jcjones/src/"
 
-DEPEND=">=app-admin/gkrellm-2*"
+DEPEND=">=app-admin/gkrellm-2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
+IUSE=""
 
 src_compile() {
 	emake || die
diff --git a/x11-plugins/gkrellm-gamma/ChangeLog b/x11-plugins/gkrellm-gamma/ChangeLog
index 543efc4ff031..0a64632a2166 100644
--- a/x11-plugins/gkrellm-gamma/ChangeLog
+++ b/x11-plugins/gkrellm-gamma/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-plugins/gkrellm-gamma
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-gamma/ChangeLog,v 1.1 2004/06/13 04:28:19 pyrania Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-gamma/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  06 Nov 2004; <pyrania@gentoo.org> gkrellm-gamma-2.03.ebuild:
+  Marked stable on x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-gamma-2.03.ebuild:
+  Masked gkrellm-gamma-2.03.ebuild stable for ppc
+
+  13 Jun 2004; David Holm <dholm@gentoo.org> gkrellm-gamma-2.03.ebuild:
+  Added to ~ppc.
 
 *gkrellm-gamma-2.03 (13 Jun 2004)
 
diff --git a/x11-plugins/gkrellm-gamma/Manifest b/x11-plugins/gkrellm-gamma/Manifest
index c7e2c1cc36df..bd1ae1b88d3a 100644
--- a/x11-plugins/gkrellm-gamma/Manifest
+++ b/x11-plugins/gkrellm-gamma/Manifest
@@ -1,2 +1,13 @@
-MD5 5ebb86e2f7cc9be92ec1553e97de774d gkrellm-gamma-2.03.ebuild 471
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 30e924d5f95c332ca7f1c7ab60772dda ChangeLog 679
+MD5 71cd4727a72081a32cdb523d2bf2e2e2 gkrellm-gamma-2.03.ebuild 580
 MD5 b862c88d160f3585f6184dd2161c9aac files/digest-gkrellm-gamma-2.03 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjPxPI7fK2cqeyXkRAth7AJ4vJTgFS9nHo4OpG6TuVuIqa/arRgCg6nfb
+xKV5RfxBsGKkOljqSFxORP4=
+=4yjZ
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-gamma/gkrellm-gamma-2.03.ebuild b/x11-plugins/gkrellm-gamma/gkrellm-gamma-2.03.ebuild
index 471f0ecc8908..f5508734fa30 100644
--- a/x11-plugins/gkrellm-gamma/gkrellm-gamma-2.03.ebuild
+++ b/x11-plugins/gkrellm-gamma/gkrellm-gamma-2.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-gamma/gkrellm-gamma-2.03.ebuild,v 1.1 2004/06/13 04:28:19 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-gamma/gkrellm-gamma-2.03.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="A gamma control plugin for gkrellm"
@@ -9,7 +9,7 @@ SRC_URI="http://sweb.cz/tripie/gkrellm/gamma/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkrellm-giFT/ChangeLog b/x11-plugins/gkrellm-giFT/ChangeLog
index e51fe19fcf6e..4b2216f6c714 100644
--- a/x11-plugins/gkrellm-giFT/ChangeLog
+++ b/x11-plugins/gkrellm-giFT/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for x11-plugins/gkrellm-giFT
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/ChangeLog,v 1.1 2003/09/06 15:43:27 sergey Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/ChangeLog,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  gkrellm-giFT-0.2.2.ebuild, gkrellm-giFT-0.2.3.ebuild:
+  Fixed dodoc not to install COPYING and/or INSTALL.
+
+  01 Oct 2004; Jon Hood <squinky86@gentoo.org> -gkrellm-giFT-0.2.1.ebuild,
+  gkrellm-giFT-0.2.3.ebuild:
+  Stable on x86.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> gkrellm-giFT-0.2.3.ebuild:
+  Added to ~ppc.
+
+*gkrellm-giFT-0.2.3 (22 Aug 2004)
+
+  22 Aug 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  gkrellm-giFT-0.2.1.ebuild, gkrellm-giFT-0.2.2.ebuild,
+  +gkrellm-giFT-0.2.3.ebuild:
+  Version bump, fix #51477 (thanks Daniel Webert <rockoo@rockoo.homelinux.org>),
+  adding metadata.xml.
+
+  09 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellm-giFT-0.2.2.ebuild:
+  Added to ~amd64.
+
+  12 Jun 2004; <pyrania@gentoo.org> gkrellm-giFT-0.2.2.ebuild:
+  Fixed bug #50350.
+
+  12 May 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellm-giFT-0.2.2.ebuild:
+  Removed S=.
+
+*gkrellm-giFT-0.2.2 (25 Mar 2004)
+
+  25 Mar 2004; Markus Nigbur <pyrania@gentoo.org> gkrellm-giFT-0.2.2.ebuild,
+  gkrellm-giFT-0.2.1.ebuild:
+  Version bump. Closing bug #38335.
+  Updated SRC_URI.
 
 *gkrellm-giFT-0.2.1 (06 Sep 2003)
 
diff --git a/x11-plugins/gkrellm-giFT/Manifest b/x11-plugins/gkrellm-giFT/Manifest
index 70ae59035468..d8542e14a750 100644
--- a/x11-plugins/gkrellm-giFT/Manifest
+++ b/x11-plugins/gkrellm-giFT/Manifest
@@ -1,2 +1,7 @@
-MD5 bc4777b20591c2efd7fe9145a5852a10 gkrellm-giFT-0.2.1.ebuild 572
-MD5 79bb8dedf4e3fe409a12e45341c99cc4 files/digest-gkrellm-giFT-0.2.1 70
+MD5 4b9d6fd30b683ffccbc3a8bda96b9008 ChangeLog 1568
+MD5 5aa9d91290281fff4d6e791a7b1fbfd5 files/digest-gkrellm-giFT-0.2.2 70
+MD5 5b4dcd6562bc0f4d82e7834a82d6c93a files/digest-gkrellm-giFT-0.2.3 70
+MD5 ee4b37fceca0148a8b06a2e93faa7d96 files/gkrellm-gift-0.2.2.patch 354
+MD5 d439d7cec174e1da415b807eb99c18d1 gkrellm-giFT-0.2.2.ebuild 772
+MD5 4c09961965899d754aedafdf01374c86 gkrellm-giFT-0.2.3.ebuild 646
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
diff --git a/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.2.ebuild b/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.2.ebuild
index 683dc20d55f6..8aee0d1c7f25 100644
--- a/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.2.ebuild
+++ b/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.2.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.2.ebuild,v 1.1 2004/03/25 02:43:55 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
+
+MY_PN=${PN/FT/ft}
+MY_P=${MY_PN}-${PV}
 DESCRIPTION="GKrellM2 plugin to monitor giFT transfers"
-SRC_URI="ftp://ftp.code-monkey.de/pub/gkrellm-gift/${P}.tar.gz"
-HOMEPAGE="http://www.code-monkey.de/gkrellm-gift.html"
+SRC_URI="ftp://ftp.code-monkey.de/pub/${MY_PN}/${P}.tar.gz"
+HOMEPAGE="http://code-monkey.de/?gkrellm-gift"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
 DEPEND=">=app-admin/gkrellm-2.1.23
 	>=net-p2p/gift-0.11.3"
 
-src_compile() {
-	econf || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+
+	if has_version ">=x11-libs/gtk+-2.4"
+	then
+		epatch ${FILESDIR}/${MY_P}.patch
+	fi
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING FAQ README
+	dodoc AUTHORS ChangeLog FAQ README
 }
diff --git a/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.3.ebuild b/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.3.ebuild
index 0210415bd047..d02466caa048 100644
--- a/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.3.ebuild
+++ b/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.3.ebuild,v 1.1 2004/08/23 03:02:35 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-giFT/gkrellm-giFT-0.2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
 MY_PN=${PN/FT/ft}
 MY_P=${MY_PN}-${PV}
@@ -9,18 +9,13 @@ SRC_URI="ftp://ftp.code-monkey.de/pub/${MY_PN}/${P}.tar.gz"
 HOMEPAGE="http://code-monkey.de/?gkrellm-gift"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
 DEPEND=">=app-admin/gkrellm-2.1.23
 	>=net-p2p/gift-0.11.3"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING FAQ README
+	dodoc AUTHORS ChangeLog FAQ README
 }
diff --git a/x11-plugins/gkrellm-gnome/ChangeLog b/x11-plugins/gkrellm-gnome/ChangeLog
index e4a7a5ca5c5a..b4b8811f5095 100644
--- a/x11-plugins/gkrellm-gnome/ChangeLog
+++ b/x11-plugins/gkrellm-gnome/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for x11-plugins/gkrellm-gnome
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-gnome/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-gnome/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
+  12 Jun 2003; <msterret@gentoo.org> gkrellm-gnome-0.1.ebuild:
+  fix Header
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellm-gnome-0.1 (14 Apr 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellm-gnome/Manifest b/x11-plugins/gkrellm-gnome/Manifest
index e69de29bb2d1..bc706ca02f91 100644
--- a/x11-plugins/gkrellm-gnome/Manifest
+++ b/x11-plugins/gkrellm-gnome/Manifest
@@ -0,0 +1,3 @@
+MD5 92e9d167cc95a6a360f058624ecc2c46 gkrellm-gnome-0.1.ebuild 709
+MD5 bedfc8fdb7309b6e535cfd28b9e0a18f ChangeLog 1498
+MD5 73b236c5fe84c649a55731b80dc2c63d files/digest-gkrellm-gnome-0.1 67
diff --git a/x11-plugins/gkrellm-gnome/gkrellm-gnome-0.1.ebuild b/x11-plugins/gkrellm-gnome/gkrellm-gnome-0.1.ebuild
index 0735ea68f16f..d2565f699e45 100644
--- a/x11-plugins/gkrellm-gnome/gkrellm-gnome-0.1.ebuild
+++ b/x11-plugins/gkrellm-gnome/gkrellm-gnome-0.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /home/cvsroot/gentoo-x86/gnome-apps/gkrellm-gnome-0.1,v 1.0 
-# 26 Apr 2001 21:30 CST blutgens Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-gnome/gkrellm-gnome-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${PN}
 DESCRIPTION="Gnome hints configuration plugin for gkrellm"
 SRC_URI="http://web.wt.net/~billw/gkrellm/Plugins/${P}.tar.gz"
 HOMEPAGE="http://web.wt.net/~billw/gkrellm/Plugins.html"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
-DEPEND=">=app-admin/gkrellm-1.2.2-r1
+DEPEND="=app-admin/gkrellm-1.2*
 	gnome-base/gnome-libs"
 
 src_compile() {
diff --git a/x11-plugins/gkrellm-hddtemp/ChangeLog b/x11-plugins/gkrellm-hddtemp/ChangeLog
index fbda9a19409f..75ab690a46fb 100644
--- a/x11-plugins/gkrellm-hddtemp/ChangeLog
+++ b/x11-plugins/gkrellm-hddtemp/ChangeLog
@@ -1,8 +1,59 @@
 # ChangeLog for x11-plugins/gkrellm-hddtemp
-# Copyright 2002 Imran Rafique; Distributed under the GPL V2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
-*gkrellm-hddtemp-0.2 (10 Jun 2002)
+  19 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  Wrong the first time. Marked stable on amd64 after all.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  multilib fixes
+
+  06 Sep 2004; Sven Wegener <swegener@gentoo.org> gkrellm-hddtemp-0.1.ebuild,
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  Updated HOMEPAGE. Thanks to Tor Klingberg <tor.klingberg@gmx.net> in bug
+  #62940.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-hddtemp-0.1.ebuild, gkrellm-hddtemp-0.2_beta.ebuild:
+  Masked gkrellm-hddtemp-0.2_beta.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-hddtemp-0.1.ebuild:
+  Masked gkrellm-hddtemp-0.1.ebuild stable for ppc
+
+  09 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellm-hddtemp-0.2_beta.ebuild:
+  Marked ~amd64.
+
+  12 May 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellm-hddtemp-0.1.ebuild:
+  Removed S=, added IUSE=.
+
+  29 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  Stable on sparc
+
+  31 Jan 2004; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  correcting einfo. closes 37234
+
+  10 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  fixed undef symbols. Closes #21686.
+
+  07 Oct 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  changed depend to gkrellm fixed version. Closes #27060.
+
+*gkrellm-hddtemp-0.2_beta (17 May 2003)
+
+  17 May 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-hddtemp-0.2_beta.ebuild:
+  Version bumped. Ebuild submitted by moonlite@linux.nu in #20370.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*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 6d1117f68ff0..cebdf237134c 100644
--- a/x11-plugins/gkrellm-hddtemp/Manifest
+++ b/x11-plugins/gkrellm-hddtemp/Manifest
@@ -1,5 +1,15 @@
-MD5 407d1e951da09acb12c39f743e1a63a4 ChangeLog 898
-MD5 a79bfb86ef8d116b5174046ae790e429 gkrellm-hddtemp-0.1.ebuild 1061
-MD5 4c1155f45a64fff06a8f026e8dcd3720 gkrellm-hddtemp-0.2_beta.ebuild 1105
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 183eb23a7000b353665294228d7d8e93 gkrellm-hddtemp-0.1.ebuild 1019
+MD5 9d203ba7661a3f1705cf827ed890c0cb gkrellm-hddtemp-0.2_beta.ebuild 1576
+MD5 dc971e270a74b2bf7a0d747d50ee614b ChangeLog 2544
 MD5 a9f57bac01537cef132c947c68eb3977 files/digest-gkrellm-hddtemp-0.1 69
 MD5 d3cc852ee5cbc0155681cecb5e3afa65 files/digest-gkrellm-hddtemp-0.2_beta 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDL0MsntT9W3vfTuoRAjYkAJ9TlHf7VW5QpQYHpYgrN8BRVAAYBwCfUSs9
+cbjRMN8RHkjil2mLJVsRamQ=
+=Xrvg
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.1.ebuild b/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.1.ebuild
index ea554fe8b162..d98ab6ea899f 100644
--- a/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.1.ebuild
+++ b/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.1.ebuild
@@ -1,24 +1,23 @@
-# 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-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.1.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="a GKrellM plugin for hddtemp (which reads the temperature of SMART IDE hard drives)"
+DESCRIPTION="a GKrellM plugin for hddtemp (which reads the temperature of SMART capable hard drives)"
 SRC_URI="http://coredump.free.fr/linux/${P}.tar.gz"
-HOMEPAGE="http://coredump.free.fr/linux/harddrive.html"
-
+HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc ppc"
 
-DEPEND=">=app-admin/gkrellm-1.2.1"
+DEPEND="=app-admin/gkrellm-1.2*
+	>=sys-apps/sed-4"
 RDEPEND=">=app-admin/hddtemp-0.2"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	# patch Makefile
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -fPIC:" Makefile.orig > Makefile
+	sed -i "s:^CFLAGS.*:CFLAGS=${CFLAGS} -fPIC:" Makefile
 }
 
 src_compile() {
@@ -27,24 +26,14 @@ src_compile() {
 
 src_install() {
 	dodoc README COPYING
-	
+
 	insinto /usr/lib/gkrellm/plugins
 	doins gkrellm-hddtemp.so
 }
 
 pkg_postinst() {
+	einfo "hddtemp has to be suid root to allow regular users to run this plugin."
+	einfo "To make it suid root, run"
 	einfo
-	einfo "#######################################################"
-	einfo "#                                                     #"
-	einfo "#   Please note that hddtemp has to be set suid       #"
-	einfo "#   in order to allow regular user to run this        #"
-	einfo "#   plugin.                                           #"
-	einfo "#                                                     #"
-	einfo "#   Please execute (as root):                         #"
-	einfo "#   chmod u+s /usr/bin/hddtemp                        #"
-	einfo "#   to set the suid bit                               #"
-	einfo "#   (this is not done automatically for               #"
-	einfo "#   security reasons)                                 #"
-	einfo "#                                                     #"
-	einfo "#######################################################"
+	einfo "\tchmod u+s /usr/bin/hddtemp"
 }
diff --git a/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta.ebuild b/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta.ebuild
index 19573367a993..70abfb467645 100644
--- a/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta.ebuild
+++ b/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta.ebuild,v 1.1 2003/05/17 11:53:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
+inherit multilib
+
+IUSE=""
 MY_P=${P/_beta/-beta}
 S=${WORKDIR}/${MY_P}
-DESCRIPTION="a GKrellM2 plugin for hddtemp (which reads the temperature of SMART IDE hard drives)"
+DESCRIPTION="a GKrellM2 plugin for hddtemp (which reads the temperature of SMART capable hard drives)"
 SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.gz"
-HOMEPAGE="http://coredump.free.fr/linux/harddrive.html"
+HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="amd64 ppc sparc x86"
 
-DEPEND="=app-admin/gkrellm-2*"
+DEPEND="=app-admin/gkrellm-2*
+	>=sys-apps/sed-4"
 RDEPEND=">=app-admin/hddtemp-0.3_beta6"
 
 src_unpack() {
@@ -28,8 +32,7 @@ src_compile() {
 		GKRELLM2=1
 		einfo "Building plugin for gkrellm-2.*"
 		make gkrellm2 || die
-	fi
-	if [ -f /usr/bin/gkrellm ]; then
+	elif [ -f /usr/bin/gkrellm ]; then
 		GKRELLM1=1
 		einfo "Building plugin for gkrellm-1.*"
 		make gkrellm1 || die
@@ -40,12 +43,12 @@ src_install() {
 	dodoc README COPYING
 	if [ $GKRELLM1 = 1 ]; then
 		einfo "Installing plugin for gkrellm-1.*"
-		insinto /usr/lib/gkrellm/plugins
+		insinto /usr/$(get_libdir)/gkrellm/plugins
 		doins gkrellm-hddtemp.so
 	fi
 	if [ $GKRELLM2 = 1 ]; then
 		einfo "Installing plugin for gkrellm-2.*"
-		insinto /usr/lib/gkrellm2/plugins
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
 		doins gkrellm-hddtemp.so
 	fi
 }
@@ -53,6 +56,6 @@ src_install() {
 pkg_postinst() {
 	einfo "hddtemp has to be suid root to allow regular users to run this plugin."
 	einfo "To make it suid root, run"
-	einfo ""
-	einfo "\tchmod u+s /usr/bin/hddtemp"
+	einfo
+	einfo "\tchmod u+s /usr/sbin/hddtemp"
 }
diff --git a/x11-plugins/gkrellm-imonc/ChangeLog b/x11-plugins/gkrellm-imonc/ChangeLog
index ae65c60d6ed6..b67bf3fb2d6d 100644
--- a/x11-plugins/gkrellm-imonc/ChangeLog
+++ b/x11-plugins/gkrellm-imonc/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-plugins/gkrellm-imonc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-imonc/ChangeLog,v 1.1 2004/01/20 23:35:01 mholzer Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-imonc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 *gkrellm-imonc-0.2 (21 Jan 2004)
 
diff --git a/x11-plugins/gkrellm-imonc/Manifest b/x11-plugins/gkrellm-imonc/Manifest
index c9fbbe51f6d9..edc34da1e244 100644
--- a/x11-plugins/gkrellm-imonc/Manifest
+++ b/x11-plugins/gkrellm-imonc/Manifest
@@ -1,2 +1,4 @@
-MD5 c62126e091710ff2473d837779cf2de5 gkrellm-imonc-0.2.ebuild 573
+MD5 0eb75f8187c88cb1b8709b86ace9dc42 ChangeLog 415
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 c18445a31d2f7d3647a80918ea94ce68 gkrellm-imonc-0.2.ebuild 687
 MD5 eb7514d7ec02fc4244c0dc4418f770f9 files/digest-gkrellm-imonc-0.2 73
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2.ebuild
index 980a8245e286..b5af6b69f57e 100644
--- a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2.ebuild
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2.ebuild,v 1.1 2004/01/20 23:35:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="A GKrellM2 plugin to control a fli4l router"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
 RESTRICT="nomirror"
diff --git a/x11-plugins/gkrellm-leds/ChangeLog b/x11-plugins/gkrellm-leds/ChangeLog
index 58543947cffa..80a0890feb3a 100644
--- a/x11-plugins/gkrellm-leds/ChangeLog
+++ b/x11-plugins/gkrellm-leds/ChangeLog
@@ -1,8 +1,47 @@
 # ChangeLog for x11-plugins/gkrellm-leds
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-leds/ChangeLog,v 1.1 2002/08/30 09:06:56 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-leds/ChangeLog,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
-*gkleds-0.6.1 (22 May 2002)
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellm-leds-0.8.1.ebuild:
+  Stable on amd64.
+
+  28 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> gkrellm-leds-0.8.1.ebuild:
+  added ~amd64 to KEYWORDS. fixes #79781
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gkrellm-leds-0.8.1.ebuild:
+  Stable on alpha.
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> gkrellm-leds-0.8.1.ebuild:
+  Added ~alpha keyword.
+
+  29 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> gkrellm-leds-0.8.1.ebuild:
+  Stable on sparc
+
+*gkrellm-leds-0.8.1 (17 Jan 2004)
+
+  17 Jan 2004; Martin Holzer <mholzer@gentoo.org> gkrellm-leds-0.8.1.ebuild:
+  Version bumped. Closes 38341
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellm-leds-0.8.0.ebuild:
+  stable on alpha
+
+*gkrellm-leds-0.8.0 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellm-leds-0.8.0.ebuild files/digest-gkrellm-leds-0.8.0 :
+
+  Version for GKrellM2
+
+*gkrellm-leds-0.6.1 (22 May 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
diff --git a/x11-plugins/gkrellm-leds/Manifest b/x11-plugins/gkrellm-leds/Manifest
index e69de29bb2d1..cd677072b5bd 100644
--- a/x11-plugins/gkrellm-leds/Manifest
+++ b/x11-plugins/gkrellm-leds/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3e06f4b2dfdd5f4e5fd225f077f717b9 gkrellm-leds-0.8.0.ebuild 713
+MD5 89d6bdd9bc71f147aff9b3ab05d9b718 gkrellm-leds-0.6.1.ebuild 706
+MD5 d426f45029094da4f0b13f0929bcd0cd ChangeLog 2026
+MD5 9353cb00281a79a57bcc7af154e3daa1 gkrellm-leds-0.8.1.ebuild 752
+MD5 852f969308b8f2fe57e7c3bc92c78ef6 files/digest-gkrellm-leds-0.6.1 63
+MD5 33b4c88351c4535432e6eb17dc257d00 files/digest-gkrellm-leds-0.8.0 63
+MD5 4c7f0317bf9bca196926345960809413 files/digest-gkrellm-leds-0.8.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/mn2G5bA0cA/ScRAg1/AKDGr9sgdLPCeSkkab0thM7ODwRcCgCfcRsV
+hPUEnyShW0kNoeeoXOPF7js=
+=/pVe
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.6.1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.6.1.ebuild
index 71b8784b89f8..f0619818ed93 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.6.1.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.6.1.ebuild
@@ -1,7 +1,8 @@
-# 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-plugins/gkrellm-leds/gkrellm-leds-0.6.1.ebuild,v 1.1 2002/08/30 09:06:56 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-leds/gkrellm-leds-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/rellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Gkrellm plugin for monitoring keyboard LEDs"
@@ -12,7 +13,7 @@ DEPEND="=app-admin/gkrellm-1.2*"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.0.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.0.ebuild
index cc435a4e351d..40561bd68bac 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.0.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.0.ebuild,v 1.1 2002/12/14 22:21:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/rellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="GKrellM2 plugin for monitoring keyboard LEDs"
@@ -12,7 +13,7 @@ DEPEND="=app-admin/gkrellm-2*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ppc ~sparc alpha"
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.1.ebuild
index 2d4042828c8f..9792e5c733cb 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.1.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.1.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.1.ebuild,v 1.1 2004/01/17 19:22:04 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.1.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
+inherit multilib
+
+IUSE=""
 MY_P=${P/rellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="GKrellM2 plugin for monitoring keyboard LEDs"
@@ -12,14 +15,14 @@ DEPEND="=app-admin/gkrellm-2*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 src_compile() {
 	make || die
 }
 
 src_install() {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkleds.so
 
 	dodoc COPYING Changelog License TODO INSTALL README
diff --git a/x11-plugins/gkrellm-logwatch/ChangeLog b/x11-plugins/gkrellm-logwatch/ChangeLog
index 90b436b7aded..6fc34965fd35 100644
--- a/x11-plugins/gkrellm-logwatch/ChangeLog
+++ b/x11-plugins/gkrellm-logwatch/ChangeLog
@@ -1,8 +1,13 @@
-# ChangeLog for x11-plugins/glogwatch
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-logwatch/ChangeLog,v 1.1 2002/08/30 09:16:05 seemant Exp $
+# ChangeLog for x11-plugins/gkrellm-logwatch
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-logwatch/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
-*glogwatch-1.0 (19 Feb 2002)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellm-logwatch-1.0 (19 Feb 2002)
+
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
diff --git a/x11-plugins/gkrellm-logwatch/Manifest b/x11-plugins/gkrellm-logwatch/Manifest
index e69de29bb2d1..016cb1144e65 100644
--- a/x11-plugins/gkrellm-logwatch/Manifest
+++ b/x11-plugins/gkrellm-logwatch/Manifest
@@ -0,0 +1,3 @@
+MD5 d242a5ed17d0053491127996bfc75e05 gkrellm-logwatch-1.0.ebuild 681
+MD5 1ac2ff114338d5482a66392dd456e1e8 ChangeLog 666
+MD5 c3b71e04d1ee9a8914cbf5334c62e15c files/digest-gkrellm-logwatch-1.0 63
diff --git a/x11-plugins/gkrellm-logwatch/gkrellm-logwatch-1.0.ebuild b/x11-plugins/gkrellm-logwatch/gkrellm-logwatch-1.0.ebuild
index 7db4f1a2b6b4..afb24c55bf9c 100644
--- a/x11-plugins/gkrellm-logwatch/gkrellm-logwatch-1.0.ebuild
+++ b/x11-plugins/gkrellm-logwatch/gkrellm-logwatch-1.0.ebuild
@@ -1,7 +1,8 @@
-# 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-plugins/gkrellm-logwatch/gkrellm-logwatch-1.0.ebuild,v 1.1 2002/08/30 09:16:05 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-logwatch/gkrellm-logwatch-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/krellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A Gkrellm plugin that tracks a log file."
@@ -10,7 +11,7 @@ HOMEPAGE="http://www.uberh4x0r.org/download/gkrellm"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
 DEPEND="=app-admin/gkrellm-1.2*"
 
diff --git a/x11-plugins/gkrellm-mailwatch/ChangeLog b/x11-plugins/gkrellm-mailwatch/ChangeLog
index ce4068d574c6..b74bf320d30a 100644
--- a/x11-plugins/gkrellm-mailwatch/ChangeLog
+++ b/x11-plugins/gkrellm-mailwatch/ChangeLog
@@ -1,9 +1,87 @@
 # ChangeLog for x11-plugins/gkrellm-mailwatch
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-mailwatch-2.4.3.ebuild:
+  Mark 2.4.3 stable on alpha
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-mailwatch-2.4.3.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-mailwatch-2.4.3.ebuild:
+  Masked gkrellm-mailwatch-2.4.3.ebuild stable for ppc
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellm-mailwatch-2.4.3.ebuild:
+  Marked ~amd64.
+
+*gkrellm-mailwatch-2.4.3 (22 Jun 2004)
+
+  22 Jun 2004; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-mailwatch-2.4.3.ebuild, metadata.xml:
+  Version bumped. Closes 51472
+
+  21 Jan 2004; Sven Blumenstein <bazik@gentoo.org>
+  gkrellm-mailwatch-2.4.2.ebuild:
+  Stable on sparc.
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-mailwatch-2.4.2.ebuild:
+  stable on alpha
+
+  17 Jul 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-mailwatch-2.4.1.ebuild, gkrellm-mailwatch-2.4.2.ebuild:
+  Removed imlib from DEPEND. Close s#24547.
+
+*gkrellm-mailwatch-2.4.2 (25 Jun 2003)
+
+  25 Jun 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-mailwatch-2.4.2.ebuild:
+  Version bumped.
+
+*gkrellm-mailwatch-2.4.1 (19 May 2003)
+
+  19 May 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-mailwatch-2.4.1.ebuild:
+  Version bumped. Closes #19763.
+
+*gkrellm-mailwatch-2.3.0 (23 Mar 2003)
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-mailwatch-2.3.0.ebuild:
+  Version bumped.
+
+*gkrellm-mailwatch-2.2.2 (19 Feb 2003)
+
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-mailwatch-2.2.2.ebuild  files/digest-gkrellm-mailwatch-2.2.2 ChangeLog :
+  Version bumped.
+
+*gkrellm-mailwatch-2.1 (18 Jan 2003)
+
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-mailwatch-2.1.ebuild:
+  Marked as stable.
+
+  18 Jan 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-mailwatch-2.1.ebuild
+  files/digest-gkrellm-mailwatch-2.1 ChangeLog :
+  Version bumped. Closes #14136
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellm-mailwatch-2.0 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellm-mailwatch-2.0.ebuild files/digest-gkrellm-mailwatch-2.0 :
+
+  GKrellM2 version, submitted by: gustavo@felisberto.net (Gustavo
+  Felisberto) in bug #8926.
 
 *gkrellm-mailwatch-0.7.2 (26 Apr 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest
index c1a2e938be31..9bfd7036f895 100644
--- a/x11-plugins/gkrellm-mailwatch/Manifest
+++ b/x11-plugins/gkrellm-mailwatch/Manifest
@@ -1,11 +1,8 @@
-MD5 2e1d705f5cd1889bb1e518db4b25f899 ChangeLog 1561
-MD5 55830788c3e20ebe7e92d6114c8b8ed9 gkrellm-mailwatch-0.7.2.ebuild 728
-MD5 d845c115db3cadec2c6d0803837997d8 gkrellm-mailwatch-2.1.ebuild 711
-MD5 bffdf2587f52b060c1168e02004e28b1 gkrellm-mailwatch-2.2.2.ebuild 715
-MD5 5fe82a1db8e7afd5536e0c9f9ba8099d gkrellm-mailwatch-2.3.0.ebuild 715
-MD5 5fe82a1db8e7afd5536e0c9f9ba8099d gkrellm-mailwatch-2.4.1.ebuild 715
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 db558289a4e71052d83af0615a8db5f7 gkrellm-mailwatch-0.7.2.ebuild 729
+MD5 16a6a8ebae54ebd4a03899540a2185d2 ChangeLog 2855
+MD5 c65a695a63a5f11217b7b7e37896180b gkrellm-mailwatch-2.4.2.ebuild 676
+MD5 bb2d6300f49b0fdee4275ef013f8f2d4 gkrellm-mailwatch-2.4.3.ebuild 711
 MD5 2682942f3d6fdc5a9af73fdf2102ec9f files/digest-gkrellm-mailwatch-0.7.2 66
-MD5 e1adfecf6bf4bf2c464050b2d43edf6d files/digest-gkrellm-mailwatch-2.1 72
-MD5 e8176fa4cdc237004985c37cc6e41b16 files/digest-gkrellm-mailwatch-2.2.2 74
-MD5 6de5b359d1ba8e7dd365c7cb96d73d3f files/digest-gkrellm-mailwatch-2.3.0 74
-MD5 ea803dbd027f51f7f8ee58e590322da6 files/digest-gkrellm-mailwatch-2.4.1 74
+MD5 336ae67c677d06e8c118ed8e7b70482a files/digest-gkrellm-mailwatch-2.4.2 74
+MD5 d8d7837bb4a476bc2a713d77aabb87e0 files/digest-gkrellm-mailwatch-2.4.3 74
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-0.7.2.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-0.7.2.ebuild
index 2d5975705a9b..b84e5eab827f 100644
--- a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-0.7.2.ebuild
+++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-0.7.2.ebuild
@@ -1,20 +1,20 @@
-# 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-plugins/gkrellm-mailwatch/gkrellm-mailwatch-0.7.2.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/gkrellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A GKrellM plugin that shows the status of additional mail boxes"
 SRC_URI="http://gkrellm.luon.net/files/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/mailwatch.phtml"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc sparc64"
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-	=x11-libs/gtk+-1.2*
+DEPEND="=app-admin/gkrellm-1.2*
 	>=media-libs/imlib-1.9.10-r1"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc "
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.2.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.2.ebuild
index 5b894e184e52..b20c7bfc5595 100644
--- a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.2.ebuild
+++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.2.ebuild,v 1.1 2003/06/24 22:59:42 mholzer Exp $ 
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${PN}
 DESCRIPTION="A GKrellM2 plugin that shows the status of additional mail boxes"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/mailwatch.phtml"
 
-DEPEND="=app-admin/gkrellm-2*
-	>=media-libs/imlib-1.9.14-r1"
+DEPEND="=app-admin/gkrellm-2*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="x86 ppc sparc alpha"
 
 src_compile() {
 	emake || die
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3.ebuild
index 8c68c8ee26f3..103ebb647a8a 100644
--- a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3.ebuild
+++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3.ebuild,v 1.1 2004/06/22 14:16:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+inherit multilib
 
 IUSE=""
 S=${WORKDIR}/${PN}
@@ -12,14 +14,14 @@ DEPEND="=app-admin/gkrellm-2*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="alpha amd64 ppc ~sparc ~x86"
 
 src_compile() {
 	emake || die
 }
 
 src_install () {
-	exeinto /usr/lib/gkrellm2/plugins
+	exeinto /usr/$(get_libdir)/gkrellm2/plugins
 	doexe mailwatch.so
 	dodoc README Changelog
 }
diff --git a/x11-plugins/gkrellm-newsticker/ChangeLog b/x11-plugins/gkrellm-newsticker/ChangeLog
index d744e0e0fdae..1ea381d91f37 100644
--- a/x11-plugins/gkrellm-newsticker/ChangeLog
+++ b/x11-plugins/gkrellm-newsticker/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for x11-plugins/gkrellm-newsticker
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-newsticker/ChangeLog,v 1.1 2003/02/13 02:51:35 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-newsticker/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-newsticker-0.3.5.ebuild:
+  Stable on amd64.
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellm-newsticker-0.3.5.ebuild:
+  Marked ~amd64.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
+  gkrellm-newsticker-0.3.5.ebuild:
+  Adding IUSE
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org>
+  gkrellm-newsticker-0.3.5.ebuild:
+  Marking stable on hppa
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-newsticker-0.3.5.ebuild:
+  stable on alpha
+
+*gkrellm-newsticker-0.3.5 (12 Jun 2003)
+
+  12 Jun 2003; <msterret@gentoo.org> gkrellm-newsticker-0.3.5.ebuild,
+  gkrellm-newsticker-0.3.ebuild:
+  fix Header
 
 *gkrellm-newsticker-0.3 (12 Feb 2003)
 
diff --git a/x11-plugins/gkrellm-newsticker/Manifest b/x11-plugins/gkrellm-newsticker/Manifest
index e69de29bb2d1..eb0c8834d4b1 100644
--- a/x11-plugins/gkrellm-newsticker/Manifest
+++ b/x11-plugins/gkrellm-newsticker/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dd4e216ccc4cae4aaef671cf39242ae3 gkrellm-newsticker-0.3.5.ebuild 748
+MD5 4f95c2a9df73244daec1d365682d5ba8 ChangeLog 1161
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 3d1d661599157d8361811d193a0a941f files/digest-gkrellm-newsticker-0.3.5 76
+MD5 a01e567f0e82ce184ff9f30803232a45 files/rdf-sources 1593
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/fp2G5bA0cA/ScRAkvHAJ0dDh6pz5L0KZe+ozLjdu+rZ5MY4QCdH2ud
+YUgsdW3AYLAFEXP2zan3Rok=
+=JJD5
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-newsticker/gkrellm-newsticker-0.3.5.ebuild b/x11-plugins/gkrellm-newsticker/gkrellm-newsticker-0.3.5.ebuild
index 88ca8e12c29c..7bd61e851fd5 100644
--- a/x11-plugins/gkrellm-newsticker/gkrellm-newsticker-0.3.5.ebuild
+++ b/x11-plugins/gkrellm-newsticker/gkrellm-newsticker-0.3.5.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
-# 26 Apr 2001 21:30 CST blutgens Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-newsticker/gkrellm-newsticker-0.3.5.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+inherit multilib
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A news headlines scroller for GKrellM2"
+HOMEPAGE="http://gk-newsticker.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://gkrellm-newsticker.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="x86 ppc ~sparc alpha hppa amd64"
+IUSE=""
 
 DEPEND="=app-admin/gkrellm-2*
-	net-ftp/curl"
+		net-misc/curl"
 
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	make || die
 }
 
-src_install () {
-	insinto /usr/lib/gkrellm2/plugins
-	doins newsticker.so
+src_install() {
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
+	doins newsticker.so || die
 	dodoc README Changelog AUTHORS FAQ THEMES
 
 	dodoc ${FILESDIR}/rdf-sources
diff --git a/x11-plugins/gkrellm-plugins/ChangeLog b/x11-plugins/gkrellm-plugins/ChangeLog
index 52c27d75c6fa..e0f9e13407de 100644
--- a/x11-plugins/gkrellm-plugins/ChangeLog
+++ b/x11-plugins/gkrellm-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/gkrellm-plugins
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-plugins/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+  10 Jul 2005; <brix@gentoo.org> gkrellm-plugins-1.2.11-r1.ebuild:
+  gkrellmwireless is now ~sparc, excluding.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  31 Oct 2002; Hannes Mehnert <hannes@mehnert.org>
+  gkrellm-plugins-1.2.11-r1.ebuild: moved gkrellmwireless to net-wireless
 
 *gkrellm-plugins-1.2.11-r1 (16 Jun 2002)
 
diff --git a/x11-plugins/gkrellm-plugins/Manifest b/x11-plugins/gkrellm-plugins/Manifest
index e69de29bb2d1..c62e9ed95fe2 100644
--- a/x11-plugins/gkrellm-plugins/Manifest
+++ b/x11-plugins/gkrellm-plugins/Manifest
@@ -0,0 +1,3 @@
+MD5 1658519f2bb38f0f9b1d8b9fc8f29b71 gkrellm-plugins-1.2.11-r1.ebuild 943
+MD5 29681e18d9e340b6c32867f3efd076d7 ChangeLog 1163
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gkrellm-plugins-1.2.11-r1 0
diff --git a/x11-plugins/gkrellm-plugins/gkrellm-plugins-1.2.11-r1.ebuild b/x11-plugins/gkrellm-plugins/gkrellm-plugins-1.2.11-r1.ebuild
index ea4f6a9a2136..193d2c06caf2 100644
--- a/x11-plugins/gkrellm-plugins/gkrellm-plugins-1.2.11-r1.ebuild
+++ b/x11-plugins/gkrellm-plugins/gkrellm-plugins-1.2.11-r1.ebuild
@@ -1,6 +1,8 @@
-# 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-plugins/gkrellm-plugins/gkrellm-plugins-1.2.11-r1.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-plugins/gkrellm-plugins-1.2.11-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+IUSE="gnome"
 
 S=${WORKDIR}/${P//gkrellm-}
 DESCRIPTION="emerge this package to install all of the gkrellm plugins"
@@ -8,22 +10,22 @@ HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
-DEPEND=">=app-admin/gkrellm-1.2.11
-		>=x11-plugins/gkrellm-bfm-0.5.1
-		>=x11-plugins/gkrellm-console-0.1
-		>=x11-plugins/gkrellm-mailwatch-0.7.2
-		>=x11-plugins/gkrellm-radio-0.3.3
-		>=x11-plugins/gkrellm-reminder-0.3.5
-		>=x11-plugins/gkrellm-volume-0.8
-		>=x11-plugins/gkrellmitime-0.4
-		>=x11-plugins/gkrellmlaunch-0.3
-		>=x11-plugins/gkrellmms-0.5.6
-		>=x11-plugins/gkrellmoon-0.3
-		>=x11-plugins/gkrellmouse-0.0.2
-		>=x11-plugins/gkrellmwho-0.4
-		>=x11-plugins/gkrellmwireless-0.2.2
-		>=x11-plugins/gkrellshoot-0.3.11
-		>=x11-plugins/gkrellweather-0.2.7-r2
-		gnome? ( >=x11-plugins/gkrellm-gnome-0.1 )"
+DEPEND="=app-admin/gkrellm-1.2*
+		x11-plugins/gkrellm-bfm
+		x11-plugins/gkrellm-console
+		x11-plugins/gkrellm-mailwatch
+		x11-plugins/gkrellm-radio
+		x11-plugins/gkrellm-reminder
+		x11-plugins/gkrellm-volume
+		x11-plugins/gkrellmitime
+		x11-plugins/gkrellmlaunch
+		x11-plugins/gkrellmms
+		x11-plugins/gkrellmoon
+		x11-plugins/gkrellmouse
+		x11-plugins/gkrellmwho
+		!sparc? ( x11-plugins/gkrellmwireless )
+		x11-plugins/gkrellshoot
+		x11-plugins/gkrellweather
+		gnome? ( x11-plugins/gkrellm-gnome )"
diff --git a/x11-plugins/gkrellm-radio/ChangeLog b/x11-plugins/gkrellm-radio/ChangeLog
index fed694dfca09..4a1a645b49f3 100644
--- a/x11-plugins/gkrellm-radio/ChangeLog
+++ b/x11-plugins/gkrellm-radio/ChangeLog
@@ -1,9 +1,53 @@
 # ChangeLog for x11-plugins/gkrellm-radio
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-radio/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-radio/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-radio-2.0.4.ebuild:
+  Masked gkrellm-radio-2.0.4.ebuild stable for ppc
+
+*gkrellm-radio-2.0.4 (22 Jun 2004)
+
+  22 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrellm-radio-2.0.4.ebuild,
+  metadata.xml:
+  Version bumped. Closes 51474
+
+  21 Jan 2004; Sven Blumenstein <bazik@gentoo.org>
+  gkrellm-radio-2.0.3-r1.ebuild:
+  Stable on sparc.
+
+*gkrellm-radio-2.0.3-r1 (08 Jul 2003)
+
+  08 Jul 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-radio-2.0.3-r1.ebuild:
+  added lirc support. Closes #23488
+
+*gkrellm-radio-2.0.3 (23 Mar 2003)
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-radio-2.0.3.ebuild:
+  Version bumped. Closes #14442.
+
+*gkrellm-radio-2.0.2 (18 Jan 2003)
+
+  18 Jan 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-radio-2.0.2.ebuild
+  files/digest-gkrellm-radio-2.0.2 ChangeLog :
+  Version bumped. Closes #14137
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellm-radio-2.0.1 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellm-radio-2.0.1.ebuild files/digest-gkrellm-radio-2.0.1 :
+
+  gkrellm2 version submitted by: gustavo@felisberto.net (Gustavo Felisberto)
+  in bug #8926 and tprado@charter.net (Tom Prado) in bug #8436.
 
 *gkrellm-radio-0.3.3 (23 May 2002)
   
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellm-radio/Manifest b/x11-plugins/gkrellm-radio/Manifest
index e69de29bb2d1..ce27ecf67351 100644
--- a/x11-plugins/gkrellm-radio/Manifest
+++ b/x11-plugins/gkrellm-radio/Manifest
@@ -0,0 +1,8 @@
+MD5 56d0042c8d990f4dd74eddd09f4fade1 ChangeLog 2010
+MD5 c78f763414c4efd99657d2c9041d78bd gkrellm-radio-0.3.3.ebuild 679
+MD5 3e66019c0623c148b44b7744b22226e7 gkrellm-radio-2.0.3-r1.ebuild 767
+MD5 eb1d0f04179d7307f9dcd77fe9393405 gkrellm-radio-2.0.4.ebuild 766
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 2c2ab358f05df52ec441577e7b4f5e51 files/digest-gkrellm-radio-0.3.3 70
+MD5 13423e2abb2543a60380e7e318340548 files/digest-gkrellm-radio-2.0.3-r1 70
+MD5 ba0f64bf42bf8710f9dd0e58ed382086 files/digest-gkrellm-radio-2.0.4 70
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-0.3.3.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-0.3.3.ebuild
index d8086a863081..05e118f02d96 100644
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-0.3.3.ebuild
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-0.3.3.ebuild
@@ -1,19 +1,19 @@
-# 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-plugins/gkrellm-radio/gkrellm-radio-0.3.3.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-radio/gkrellm-radio-0.3.3.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${PN}
 DESCRIPTION="A GKrellM plugin to control radio tuners"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.phtml"
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-	=x11-libs/gtk+-1.2*
+DEPEND="=app-admin/gkrellm-1.2*
 	>=media-libs/imlib-1.9.10-r1"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.3-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.3-r1.ebuild
index 33b0c309c219..4b6cacfec870 100644
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.3-r1.ebuild
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.3-r1.ebuild,v 1.1 2003/07/08 21:29:43 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 IUSE="lirc"
 
@@ -15,7 +15,7 @@ DEPEND="=app-admin/gkrellm-2*
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 src_compile() {
 	use lirc && myconf="${myconf} WITH_LIRC=1"
@@ -25,5 +25,5 @@ src_compile() {
 src_install () {
 	exeinto /usr/lib/gkrellm2/plugins
 	doexe radio.so
-	dodoc README CHANGES 
+	dodoc README CHANGES
 }
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
index 618f0a22dd67..e3398d229738 100644
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild,v 1.1 2004/06/22 15:38:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 IUSE="lirc"
 
@@ -15,7 +15,7 @@ DEPEND="=app-admin/gkrellm-2*
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ppc ~sparc"
 
 src_compile() {
 	use lirc && myconf="${myconf} WITH_LIRC=1"
diff --git a/x11-plugins/gkrellm-reminder/ChangeLog b/x11-plugins/gkrellm-reminder/ChangeLog
index 182f470213b0..63e39fd70034 100644
--- a/x11-plugins/gkrellm-reminder/ChangeLog
+++ b/x11-plugins/gkrellm-reminder/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for x11-plugins/gkrellm-reminder
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-reminder/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-reminder/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-reminder-2.0.0.ebuild:
+  Stable on amd64.
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellm-reminder-2.0.0.ebuild:
+  Marked ~amd64.
+
+  14 Mar 2004; Jason Wever <weeve@gentoo.org> gkrellm-reminder-2.0.0.ebuild:
+  Stable on sparc.
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-reminder-2.0.0.ebuild:
+  stable on alpha
+
+  07 Oct 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-reminder-0.3.5.ebuild:
+  changed depend to old gkrellm-1. Closes #25364.
+
+*gkrellm-reminder-2.0.0 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellm-reminder-2.0.0.ebuild files/digest-gkrellm-reminder-2.0.0 :
+
+  Version for GKrellM2
 
 *gkrellm-reminder-0.3.5 (14 Apr 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellm-reminder/Manifest b/x11-plugins/gkrellm-reminder/Manifest
index e69de29bb2d1..43f499d0926d 100644
--- a/x11-plugins/gkrellm-reminder/Manifest
+++ b/x11-plugins/gkrellm-reminder/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 431f967320e5f44bb05e163ca0fc9fef gkrellm-reminder-0.3.5.ebuild 686
+MD5 34ad7d34662b7298d563063f497a1034 ChangeLog 1898
+MD5 ade671a31a0da86af3cb53ad78b9bb85 gkrellm-reminder-2.0.0.ebuild 653
+MD5 d042144fa195e9b3058d5d950fadebf3 files/digest-gkrellm-reminder-0.3.5 65
+MD5 27fc8389ef51f891924671711028a81f files/digest-gkrellm-reminder-2.0.0 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/dI2G5bA0cA/ScRAqieAJ4tr144qfEfBD6tX8cK4rGnIMui1gCg4IKg
+aQBAGKdV46ykcJFwGUEWSfI=
+=hNGB
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-reminder/gkrellm-reminder-0.3.5.ebuild b/x11-plugins/gkrellm-reminder/gkrellm-reminder-0.3.5.ebuild
index 3bc3bce20c20..640d787dcfc3 100644
--- a/x11-plugins/gkrellm-reminder/gkrellm-reminder-0.3.5.ebuild
+++ b/x11-plugins/gkrellm-reminder/gkrellm-reminder-0.3.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-reminder/gkrellm-reminder-0.3.5.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/gkrellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="a Reminder Plugin for Gkrellm"
@@ -9,9 +10,9 @@ SRC_URI="http://engr.oregonstate.edu/~simonsen/reminder/${MY_P}.tar.gz"
 HOMEPAGE="http://www.engr.orst.edu/~simonsen/reminder"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
-DEPEND=">=app-admin/gkrellm-1.2.1"
+DEPEND="=app-admin/gkrellm-1.2*"
 
 src_compile() {
 	make || die
@@ -20,5 +21,5 @@ src_compile() {
 src_install () {
 	insinto /usr/lib/gkrellm/plugins
 	doins reminder.so
-	dodoc README ChangeLog COPYING 
+	dodoc README ChangeLog COPYING
 }
diff --git a/x11-plugins/gkrellm-reminder/gkrellm-reminder-2.0.0.ebuild b/x11-plugins/gkrellm-reminder/gkrellm-reminder-2.0.0.ebuild
index 03f573e4abc7..2e6478f13291 100644
--- a/x11-plugins/gkrellm-reminder/gkrellm-reminder-2.0.0.ebuild
+++ b/x11-plugins/gkrellm-reminder/gkrellm-reminder-2.0.0.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-reminder/gkrellm-reminder-2.0.0.ebuild,v 1.1 2002/12/14 22:16:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-reminder/gkrellm-reminder-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit multilib
+
+IUSE=""
 DESCRIPTION="a Reminder Plugin for GKrellM2"
 SRC_URI="http://web.wt.net/~billw/gkrellm/Plugins/${P}.tar.gz"
 HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 DEPEND="=app-admin/gkrellm-2*"
 
@@ -18,7 +20,7 @@ src_compile() {
 }
 
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins reminder.so
-	dodoc README ChangeLog COPYING 
+	dodoc README ChangeLog COPYING
 }
diff --git a/x11-plugins/gkrellm-sensors/ChangeLog b/x11-plugins/gkrellm-sensors/ChangeLog
index cf6ec7d07d7e..6f1d0efa4c58 100644
--- a/x11-plugins/gkrellm-sensors/ChangeLog
+++ b/x11-plugins/gkrellm-sensors/ChangeLog
@@ -1,9 +1,27 @@
 # ChangeLog for x11-plugins/gkrellm-sensors
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-sensors/ChangeLog,v 1.1 2002/08/30 09:11:26 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-sensors/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  gkrellm-sensors-0.1.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  18 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  gkrellm-sensors-0.1.ebuild:
+  Removed ppc from keywords, as we no longer have kernel 2.4.
+
+*gkrellm-sensors-0.1 (26 Dec 2003)
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> gkrellm-sensors-0.1.ebuild:
+  Masked on sparc as lm_sensors doesn't work.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gklmsensors-0.1 (21 May 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins and renamed to gkrellm-sensors
diff --git a/x11-plugins/gkrellm-sensors/Manifest b/x11-plugins/gkrellm-sensors/Manifest
index e69de29bb2d1..e2f68fe9ce36 100644
--- a/x11-plugins/gkrellm-sensors/Manifest
+++ b/x11-plugins/gkrellm-sensors/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e9a890cc1763acddc393d1616b126dc9 gkrellm-sensors-0.1.ebuild 688
+MD5 3585fa15691fb4d164c027bc30fdcfc5 ChangeLog 1127
+MD5 2d5df52abe8d875cdb84a150a5c16deb files/digest-gkrellm-sensors-0.1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCIeIGI1lqEGTUzyQRAoxsAJ9/tHcionSGC8abt4q2/oP7Oz5uEwCcD4AC
+5S9RqXUveQKyirufe+sYY2U=
+=lNk/
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-sensors/gkrellm-sensors-0.1.ebuild b/x11-plugins/gkrellm-sensors/gkrellm-sensors-0.1.ebuild
index 9bdab22ee80e..cd9eca58534a 100644
--- a/x11-plugins/gkrellm-sensors/gkrellm-sensors-0.1.ebuild
+++ b/x11-plugins/gkrellm-sensors/gkrellm-sensors-0.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 2002 Robin Cull
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-sensors/gkrellm-sensors-0.1.ebuild,v 1.1 2002/08/30 09:11:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-sensors/gkrellm-sensors-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/gkrellm-/gklm}
 S=${WORKDIR}/gklmsensors
 DESCRIPTION="A GKrellm plugin for monitoring lm_sensors"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/gklmsensors/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 -ppc -sparc"
 
 DEPEND="=app-admin/gkrellm-1.2*
 	>=sys-apps/lm_sensors-2.6.3"
@@ -21,5 +22,5 @@ src_compile() {
 
 src_install() {
 	insinto /usr/lib/gkrellm/plugins
-	doins sensors.so	
+	doins sensors.so
 }
diff --git a/x11-plugins/gkrellm-seti/ChangeLog b/x11-plugins/gkrellm-seti/ChangeLog
index 3fe639b565ef..d72a9dc2a308 100644
--- a/x11-plugins/gkrellm-seti/ChangeLog
+++ b/x11-plugins/gkrellm-seti/ChangeLog
@@ -1,7 +1,33 @@
 # ChangeLog for x11-plugins/gkrellm-seti
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-seti/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-seti/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-seti-0.7.0b-r1.ebuild:
+  Mark 0.7.0b-r1 stable on alpha
+
+  15 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/gentoo-gkrellm-seti-path.patch, gkrellm-seti-0.7.0b-r1.ebuild:
+  Patch to change the default data path to /var/lib/setiathome where gentoo puts
+  it
+
+  28 Mar 2004; Markus Nigbur <pyrania@gentoo.org>
+  gkrellm-seti-0.7.0b-r1.ebuild:
+  Stable on sparc.
+
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  gkrellm-seti-0.7.0b-r1.ebuild:
+  add ~alpha
+
+*gkrellm-seti-0.7.0b-r1 (17 Jul 2003)
+
+  17 Jul 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellm-seti-0.7.0b-r1.ebuild:
+  Added support for gtk+2. Ebuild submitted by Abhishek Amit <andrd@gentoo.org>
+  in #15832.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellm-seti-0.7.0b (14 Jul 2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/gkrellm-seti/Manifest b/x11-plugins/gkrellm-seti/Manifest
index e69de29bb2d1..a08d94b96929 100644
--- a/x11-plugins/gkrellm-seti/Manifest
+++ b/x11-plugins/gkrellm-seti/Manifest
@@ -0,0 +1,6 @@
+MD5 4f1c92f37a7764824a72d061b4d38dfb gkrellm-seti-0.7.0b-r1.ebuild 948
+MD5 c6eff7ae2bf9b6411ba5efa8c1a2e1ec ChangeLog 1900
+MD5 93c7b15f0f4cfa1bc3f47449d4967f06 gkrellm-seti-0.7.0b.ebuild 661
+MD5 bfd3e3cbfb00f1c630d0e58150938469 files/gentoo-gkrellm-seti-path.patch 460
+MD5 c79fdc203389fa5aa81ceab9c0ffd99e files/digest-gkrellm-seti-0.7.0b-r1 136
+MD5 a32b44af64f0cbf1704ed8c3a53ed2c2 files/digest-gkrellm-seti-0.7.0b 63
diff --git a/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b-r1.ebuild b/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b-r1.ebuild
index 91fe463aa59a..67ca498e2586 100644
--- a/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b-r1.ebuild
+++ b/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b-r1.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b-r1.ebuild,v 1.1 2003/07/16 16:50:19 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
+inherit eutils
+
+IUSE=""
 S=${WORKDIR}/${P//gkrellm-}
 DESCRIPTION="a Seti@Home Monitor Plugin for Gkrellm"
 SRC_URI="http://xavier.serpaggi.free.fr/seti/${P//gkrellm-}.tar.bz2 http://xavier.serpaggi.free.fr/seti/GKrellM_seti_plugin_GTK+2.tgz"
@@ -11,12 +14,17 @@ DEPEND="=app-admin/gkrellm-2.1*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="alpha sparc x86"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/gentoo-gkrellm-seti-path.patch || die "failed to apply patch"
 	mv ${WORKDIR}/Makefile ${S}
 	mv ${WORKDIR}/seti.c ${S}
 	mv ${WORKDIR}/seti.h ${S}
+}
+
+src_compile() {
 	make || die
 }
 
diff --git a/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b.ebuild b/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b.ebuild
index b01a31c0ae9e..ebcd7b86cc31 100644
--- a/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b.ebuild
+++ b/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b.ebuild
@@ -1,17 +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-plugins/gkrellm-seti/gkrellm-seti-0.7.0b.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-seti/gkrellm-seti-0.7.0b.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${P//gkrellm-}
 DESCRIPTION="a Seti@Home Monitor Plugin for Gkrellm"
 SRC_URI="http://xavier.serpaggi.free.fr/seti/${P//gkrellm-}.tar.bz2"
 HOMEPAGE="http://xavier.serpaggi.free.fr/seti"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc sparc64"
 
-DEPEND="app-admin/gkrellm
-	"
+DEPEND="=app-admin/gkrellm-1.2*"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc "
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-trayicons/ChangeLog b/x11-plugins/gkrellm-trayicons/ChangeLog
index 5546e3d1a9be..fac9759fc954 100644
--- a/x11-plugins/gkrellm-trayicons/ChangeLog
+++ b/x11-plugins/gkrellm-trayicons/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-plugins/gkrellm-trayicons
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-trayicons/ChangeLog,v 1.1 2004/04/20 15:31:22 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-trayicons/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-trayicons-1.02.ebuild:
+  Stable on amd64.
+
+  31 May 2004; Danny van Dyk <kugelfang@gentoo.org>
+  gkrellm-trayicons-1.02.ebuild:
+  Marked ~amd64.
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  gkrellm-trayicons-1.02.ebuild:
+  fix IUSE; emake error message
+
+  20 Apr 2004; David Holm <dholm@gentoo.org> gkrellm-trayicons-1.02.ebuild:
+  Added to ~ppc.
 
 *gkrellm-trayicons-1.02 (20 Apr 2004)
 
diff --git a/x11-plugins/gkrellm-trayicons/Manifest b/x11-plugins/gkrellm-trayicons/Manifest
index 01ff3041dac1..dd22db68cf3e 100644
--- a/x11-plugins/gkrellm-trayicons/Manifest
+++ b/x11-plugins/gkrellm-trayicons/Manifest
@@ -1,2 +1,14 @@
-MD5 201fdeaab9ebce0c51ca55d87d5c051e gkrellm-trayicons-1.02.ebuild 643
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 84b9e0da8296ff5bb513d709d5c9fa0b ChangeLog 865
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 3d32fdc69119be2aa57ff131f422380d gkrellm-trayicons-1.02.ebuild 681
 MD5 e8d365b59588dee3c9dd7d3e0e3cea77 files/digest-gkrellm-trayicons-1.02 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/bE2G5bA0cA/ScRAlFxAKDyhqWm1N4aH+kWWclqPjVzT7wdvQCcCbwy
+5Au+OASireEpD1pOddvjUZM=
+=+TVH
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.02.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.02.ebuild
index 590effc2eed8..68165e35e4af 100644
--- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.02.ebuild
+++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.02.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.02.ebuild,v 1.1 2004/04/20 15:31:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.02.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+inherit multilib
 
 DESCRIPTION="Configurable Tray Icons for GKrellM"
 HOMEPAGE="http://sweb.cz/tripie/gkrellm/trayicons/"
 SRC_URI="http://sweb.cz/tripie/gkrellm/trayicons/dist/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="mpeg4"
+KEYWORDS="~x86 ppc amd64"
+IUSE=""
 
 DEPEND="app-admin/gkrellm"
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins trayicons.so
 	dodoc AUTHORS LICENSE ChangeLog
 }
diff --git a/x11-plugins/gkrellm-vaiobright/ChangeLog b/x11-plugins/gkrellm-vaiobright/ChangeLog
index 3d81ad82909e..d11b78577f0c 100644
--- a/x11-plugins/gkrellm-vaiobright/ChangeLog
+++ b/x11-plugins/gkrellm-vaiobright/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for x11-plugins/gkrellm-vaiobright
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-vaiobright/ChangeLog,v 1.1 2003/03/16 19:20:27 liquidx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-vaiobright/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 *gkrellm-vaiobright-2.5 (16 Mar 2003)
 
+  20 Mar 2003; Alastair Tse <liquidx@gentoo.org>
+  gkrellm-vaiobright-2.5.ebuild:
+  change src uri
+
   16 Mar 2003; Alastair Tse <liquidx@gentoo.org>
   gkrellm-vaiobright-2.5.ebuild:
   initial commit.
diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index e69de29bb2d1..a0473bba0038 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -0,0 +1,3 @@
+MD5 0b1f0168263ab2893bb51a82a929499f gkrellm-vaiobright-2.5.ebuild 664
+MD5 58a22e7f1a3cbdc4762665d87aefd4cd ChangeLog 475
+MD5 0be817eec94e97665f0a151f9dcde668 files/digest-gkrellm-vaiobright-2.5 64
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5.ebuild
index c5001f175f3b..7cfb6e507e5f 100644
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5.ebuild
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5.ebuild,v 1.1 2003/03/16 19:20:27 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 IUSE=""
 
 MY_P=${P/gkrellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm"
-SRC_URI="http://nerv-nu.net/~dragorn/code/${MY_P}.tar.gz"
-HOMEPAGE="http://nerv-nu.net/~dragorn/"
+SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz"
+HOMEPAGE="http://nerv-un.net/~dragorn/"
 
 DEPEND=">=app-admin/gkrellm-2.0"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -*"
+KEYWORDS="x86 -*"
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-volume/ChangeLog b/x11-plugins/gkrellm-volume/ChangeLog
index f63e86df1062..e65c48deeede 100644
--- a/x11-plugins/gkrellm-volume/ChangeLog
+++ b/x11-plugins/gkrellm-volume/ChangeLog
@@ -1,9 +1,82 @@
 # ChangeLog for x11-plugins/gkrellm-volume
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellm-volume-2.1.13.ebuild:
+  multilib fixes
+
+*gkrellm-volume-2.1.13 (22 Mar 2005)
+
+  22 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +gkrellm-volume-2.1.13.ebuild:
+  Version bumped, bug #51473
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gkrellm-volume-2.1.9.ebuild:
+  Stable on alpha.
+
+  22 Jan 2004; Lars Weiler <pylon@gentoo.org> gkrellm-volume-2.1.9.ebuild:
+  Add ~ppc to keywords
+
+  21 Jan 2004; Sven Blumenstein <bazik@gentoo.org>
+  gkrellm-volume-2.1.9.ebuild:
+  Stable on sparc.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellm-volume-2.1.8.ebuild:
+  stable on alpha
+
+*gkrellm-volume-2.1.9 (21 Oct 2003)
+
+  21 Oct 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-volume-2.1.9.ebuild:
+  Version bumped.
+
+  04 Sep 2003; Aron Griffis <agriffis@gentoo.org> gkrellm-volume-2.1.8.ebuild:
+  add ~alpha to KEYWORDS
+
+  17 Jul 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-volume-2.1.8.ebuild:
+  Marked x86 stable.
+
+*gkrellm-volume-2.1.8 (25 Jun 2003)
+
+  25 Jun 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-volume-2.1.8.ebuild:
+  Version bumped.
+
+  12 Jun 2003; <msterret@gentoo.org> gkrellm-volume-0.8-r1.ebuild,
+  gkrellm-volume-2.1.4.ebuild, gkrellm-volume-2.1.6.ebuild,
+  gkrellm-volume-2.1.7.ebuild:
+  fix Header
+
+*gkrellm-volume-2.1.7 (23 Mar 2003)
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-volume-2.1.7.ebuild:
+  Version bumped. Closes #14441.
+
+*gkrellm-volume-2.1.6 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellm-volume-2.1.6.ebuild files/digest-gkrellm-volume-2.1.6 :
+
+  Version bump. Moved 2.1.4 to stable
+
+*gkrellm-volume-2.1.4 (16 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellm-volume-2.1.4.ebuild files/digest-gkrellm-volume-2.1.4 :
+
+  New version (SLOTified) for gkrellm2.  Thanks to
+  43fcmm6rz001@sneakemail.com (Tobias Quinn) in bug #7363
 
 *gkrellm-volume-0.8-r1 (14 Apr 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentool.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellm-volume/Manifest b/x11-plugins/gkrellm-volume/Manifest
index e69de29bb2d1..c0795f526e6d 100644
--- a/x11-plugins/gkrellm-volume/Manifest
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8c2c2de151c53f0c315e692452a87c95 gkrellm-volume-2.1.8.ebuild 647
+MD5 8cceecdbfeda865ce3cadb2300ce8507 gkrellm-volume-0.8-r1.ebuild 661
+MD5 7230cf52887ad46af14b4ef3813d1c41 gkrellm-volume-2.1.13.ebuild 790
+MD5 4c83e76704829756afa8e8976073eaa8 ChangeLog 3179
+MD5 a2ce0703427837452e595abc088f23d0 gkrellm-volume-2.1.9.ebuild 637
+MD5 0814cc15c92dfe6e05aa45d42e9cc688 gkrellm-volume-2.1.4.ebuild 640
+MD5 a18cbdcd4b31d7c260d919c06bddf49f files/digest-gkrellm-volume-2.1.4 71
+MD5 f2001f12fbad1f63746f0a6ed1b3d1ca files/digest-gkrellm-volume-2.1.8 71
+MD5 1dcd8db72c24863a757ef7f71d7110da files/digest-gkrellm-volume-2.1.9 71
+MD5 c4db1e8ff3314d790cd18c87ac342d13 files/digest-gkrellm-volume-0.8-r1 60
+MD5 97cc15b2b54ba61a017e7391013319b8 files/digest-gkrellm-volume-2.1.13 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/Sl2G5bA0cA/ScRAkhPAJ44MnbZi/LkMgRzjNe8A/mOBaX/VwCg3ZY2
+AC1oDrl2kw5iREO4Y/vGtvY=
+=7udq
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild
index a74ab0f38e50..149915ebb0d8 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
-# 26 Apr 2001 21:30 CST blutgens Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+IUSE=""
 MY_P=${PN/gkrellm-/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A mixer control plugin for gkrellm"
 SRC_URI="http://gkrellm.luon.net/files/${MY_P}-${PV}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/volume.phtml"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc sparc64"
 
-DEPEND=">=app-admin/gkrellm-1.0.6"
+DEPEND="=app-admin/gkrellm-1.2*"
 
-src_compile() {
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc "
 
+src_compile() {
 	make || die
-
 }
 
 src_install () {
-
 	insinto /usr/lib/gkrellm/plugins
 	doins volume.so
 	dodoc README Changelog
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
index 757af49abe21..b3694136ad2e 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild,v 1.1 2005/03/22 18:04:18 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+inherit multilib
 
 IUSE="alsa"
 DESCRIPTION="A mixer control plugin for gkrellm"
@@ -26,7 +28,7 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins volume.so
 	dodoc README Changelog
 }
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.4.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.4.ebuild
index 1b2804775d31..83b469fd3485 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.4.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.4.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
-# 26 Apr 2001 21:30 CST blutgens Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+IUSE=""
 MY_P=${PN}2-${PV}
 S=${WORKDIR}/${PN}
 DESCRIPTION="A mixer control plugin for gkrellm"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/volume.phtml"
 
-DEPEND="=app-admin/gkrellm-2.0*"
+DEPEND="=app-admin/gkrellm-2*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~sparc64"
+KEYWORDS="x86 sparc"
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.8.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.8.ebuild
index 0f6a43a53892..0f27d6d5c4d4 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.8.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.8.ebuild,v 1.1 2003/06/24 23:07:59 mholzer Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.8.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+IUSE=""
 MY_P=${PN}2-${PV}
 S=${WORKDIR}/${PN}
 DESCRIPTION="A mixer control plugin for gkrellm"
@@ -12,7 +13,7 @@ DEPEND="=app-admin/gkrellm-2*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc alpha"
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild
index ed497ead3011..4712c5076cc2 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild,v 1.1 2003/10/21 20:58:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
-MY_P=${PN}2-${PV}
-S=${WORKDIR}/${PN}
+IUSE=""
 DESCRIPTION="A mixer control plugin for gkrellm"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/volume.phtml"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 DEPEND="=app-admin/gkrellm-2*"
 
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	insinto /usr/lib/gkrellm2/plugins
 	doins volume.so
 	dodoc README Changelog
diff --git a/x11-plugins/gkrellm-wifi/ChangeLog b/x11-plugins/gkrellm-wifi/ChangeLog
index fd650cfc7ccd..6cdbd6500057 100644
--- a/x11-plugins/gkrellm-wifi/ChangeLog
+++ b/x11-plugins/gkrellm-wifi/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for x11-plugins/gkrellm-wifi
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-wifi/ChangeLog,v 1.1 2004/06/01 14:41:17 tseng Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-wifi/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellm-wifi-0.9.12.ebuild:
+  multilib fixes
+
+  25 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  gkrellm-wifi-0.9.12.ebuild:
+  Marked stable on amd64.
+
+  04 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> metadata.xml:
+  Assigning ownership to myself
+
+  10 Sep 2004; Henrik Brix Andersen <brix@gentoo.org>
+  gkrellm-wifi-0.9.12.ebuild:
+  Updated HOMEPAGE and SRC_URI
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellm-wifi-0.9.12.ebuild:
+  Masked gkrellm-wifi-0.9.12.ebuild stable for ppc
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellm-wifi-0.9.12.ebuild:
+  Marked ~amd64.
+
+  03 Jul 2004; <pyrania@gentoo.org> gkrellm-wifi-0.9.12.ebuild:
+  Stable on x86.
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> gkrellm-wifi-0.9.12.ebuild:
+  iAdded to ~ppc.
 
 *gkrellm-wifi-0.9.12 (01 Jun 2004)
 
diff --git a/x11-plugins/gkrellm-wifi/Manifest b/x11-plugins/gkrellm-wifi/Manifest
index b0156a2cdf3f..2562710d39a3 100644
--- a/x11-plugins/gkrellm-wifi/Manifest
+++ b/x11-plugins/gkrellm-wifi/Manifest
@@ -1,3 +1,14 @@
-MD5 f40f47f9a4ea7d71806d3dd0315fa294 ChangeLog 238
-MD5 f0c44a4380a588fe5bb15f4d887a05cb gkrellm-wifi-0.9.12.ebuild 655
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8bad78d2ab0d54c2c9c32035825087c4 gkrellm-wifi-0.9.12.ebuild 783
+MD5 a581d6b2b67bcefdd3aadfa26566cb9c ChangeLog 1339
+MD5 dc1773fc29727c205a632b4a780a5d21 metadata.xml 219
 MD5 22c33f70a423179c9900167ef3354a7e files/digest-gkrellm-wifi-0.9.12 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/O52G5bA0cA/ScRAhn9AJ9uTzCu3N8UBy9/Nx7FagwX+Qj0IwCg0Zly
+eAGvIQes39gAaVf+tr4UOZg=
+=e1q/
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-wifi/gkrellm-wifi-0.9.12.ebuild b/x11-plugins/gkrellm-wifi/gkrellm-wifi-0.9.12.ebuild
index 3e73c34877e4..a3f5b7267193 100644
--- a/x11-plugins/gkrellm-wifi/gkrellm-wifi-0.9.12.ebuild
+++ b/x11-plugins/gkrellm-wifi/gkrellm-wifi-0.9.12.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-wifi/gkrellm-wifi-0.9.12.ebuild,v 1.1 2004/06/01 14:41:17 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-wifi/gkrellm-wifi-0.9.12.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+inherit multilib
 
 DESCRIPTION="A GKrellM2 plug-in for monitoring the link quality of your wireless LAN cards"
-HOMEPAGE="http://brix.gimp.org/files/gkrellm-wifi/"
-SRC_URI="http://brix.gimp.org/files/gkrellm-wifi/${P}.tar.gz"
+HOMEPAGE="http://dev.gentoo.org/files/gkrellm-wifi/"
+SRC_URI="http://dev.gentoo.org/files/gkrellm-wifi/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64"
 IUSE=""
 
 DEPEND=">=app-admin/gkrellm-2.1.12"
@@ -19,7 +21,7 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/lib/gkrellm2/plugins
+	exeinto /usr/$(get_libdir)/gkrellm2/plugins
 	doexe gkrellm-wifi.so
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THEMING TODO
 }
diff --git a/x11-plugins/gkrellm-wifi/metadata.xml b/x11-plugins/gkrellm-wifi/metadata.xml
index 731225048652..042b87179f01 100644
--- a/x11-plugins/gkrellm-wifi/metadata.xml
+++ b/x11-plugins/gkrellm-wifi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+<herd>mobile</herd>
+<maintainer>
+  <email>brix@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-xkb/ChangeLog b/x11-plugins/gkrellm-xkb/ChangeLog
index d646707ac43c..57ce7fbf0ccc 100644
--- a/x11-plugins/gkrellm-xkb/ChangeLog
+++ b/x11-plugins/gkrellm-xkb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/gkrellm-xkb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-xkb/ChangeLog,v 1.1 2005/02/08 10:46:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-xkb/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+  02 Sep 2005; Andrej Kacian <ticho@gentoo.org> gkrellm-xkb-1.05.ebuild:
+  Stable on x86.
 
 *gkrellm-xkb-1.05 (08 Feb 2005)
 
diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
index 442ebee10856..b71b11868d80 100644
--- a/x11-plugins/gkrellm-xkb/Manifest
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0b3a68434d3b40598e39873383cf3344 ChangeLog 452
 MD5 bd9e210457c22384582e7c1394314d3f metadata.xml 250
-MD5 3241323d43976621e5ba12b135cfcc8f gkrellm-xkb-1.05.ebuild 508
+MD5 f451363c6f7fa3f009aae9e4f8d16b51 gkrellm-xkb-1.05.ebuild 615
 MD5 b38ad568b9f37174a43010516fa22f19 files/digest-gkrellm-xkb-1.05 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGKaWQlM6RnzZP+IRAquqAJ0XPyl+1xcXmSIUoGRg9UfjAmOMZgCeOvOS
+ItrORodcmcIvS4bEV1Dpqfo=
+=wxji
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05.ebuild
index 07909ab145d6..07cf95fc1a5f 100644
--- a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05.ebuild
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05.ebuild,v 1.1 2005/02/08 10:46:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 DESCRIPTION="XKB keyboard switcher for gkrellm2"
 HOMEPAGE="http://sweb.cz/tripie/gkrellm/xkb/"
@@ -8,7 +8,7 @@ SRC_URI="http://sweb.cz/tripie/gkrellm/xkb/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=app-admin/gkrellm-2"
diff --git a/x11-plugins/gkrellmbups/ChangeLog b/x11-plugins/gkrellmbups/ChangeLog
index 32771e380ccc..358fe9602ea7 100644
--- a/x11-plugins/gkrellmbups/ChangeLog
+++ b/x11-plugins/gkrellmbups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/gkrellmbups
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/ChangeLog,v 1.1 2004/07/20 17:58:34 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> gkrellmbups-2.0.2.ebuild:
+  Added to ~ppc.
 
 *gkrellmbups-2.0.2 (20 Jul 2004)
 
diff --git a/x11-plugins/gkrellmbups/Manifest b/x11-plugins/gkrellmbups/Manifest
index b550b457706c..00d6ec407af6 100644
--- a/x11-plugins/gkrellmbups/Manifest
+++ b/x11-plugins/gkrellmbups/Manifest
@@ -1,2 +1,4 @@
-MD5 00974f77ed9a6d41574bd808ff5698b9 gkrellmbups-2.0.2.ebuild 638
+MD5 248db63ba3bb4cb7703c0b4b8582230a ChangeLog 477
+MD5 31555ee4dd4b7088d62951f3d491b484 gkrellmbups-2.0.2.ebuild 778
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
 MD5 2efcdfd75e95c4461a3affba24aa2dad files/digest-gkrellmbups-2.0.2 68
diff --git a/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild b/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild
index 1016de7b0d49..2fe0e8584b17 100644
--- a/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild
+++ b/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild,v 1.1 2004/07/20 17:58:34 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="GKrellM2 Belkin UPS monitor Plugin"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.starforge.co.uk/gkrellm/gkrellmbups.shtml"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkrellmitime/ChangeLog b/x11-plugins/gkrellmitime/ChangeLog
index 956a5e9462c4..74a5e4bd8258 100644
--- a/x11-plugins/gkrellmitime/ChangeLog
+++ b/x11-plugins/gkrellmitime/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for x11-plugins/gkrellmitime
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> gkrellmitime-1.0.ebuild,
+  gkrellmitime-1.0.1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmitime-1.0.1.ebuild:
+  Stable on amd64.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> gkrellmitime-1.0.1.ebuild:
+  Stable on alpha.
+
+  21 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> gkrellmitime-1.0.1.ebuild:
+  marked ~amd64
+
+  01 Mar 2004; Markus Nigbur <pyrania@gentoo.org> gkrellmitime-0.5.1.ebuild:
+  Stable on x86.
+
+  21 Jan 2004; Sven Blumenstein <bazik@gentoo.org> gkrellmitime-1.0.1.ebuild:
+  Stable on sparc.
+
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellmitime-1.0.1.ebuild,
+  gkrellmitime-1.0.ebuild:
+  mark 1.0 stable on alpha; add ~alpha to 1.0.1
+
+*gkrellmitime-1.0.1 (18 Jan 2004)
+
+  18 Jan 2004; Martin Holzer <mholzer@gentoo.org> gkrellmitime-1.0.1.ebuild:
+  Version bumped. Closes 38340
+
+  18 Sep 2003; David Holm <dholm@gentoo.org> gkrellmitime-1.0.ebuild:
+  Added to ~ppc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellmitime-1.0 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmitime-1.0.ebuild
+  files/digest-gkrellmitime-1.0 :
+
+  GKrellM2 version submitted by: gustavo@felisberto.net (Gustavo Felisberto)
+  in bug #8926.
+
+*gkrellmitime-0.5.1 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellmitime-0.5.1.ebuild files/digest-gkrellmitime-0.5.1 :
+
+  Version bump for the gkrellm version (includes NLS support now).
 
 *gkrellmitime-0.4 (1 Feb 2002)
 
diff --git a/x11-plugins/gkrellmitime/Manifest b/x11-plugins/gkrellmitime/Manifest
index e69de29bb2d1..9d0c2f153f5a 100644
--- a/x11-plugins/gkrellmitime/Manifest
+++ b/x11-plugins/gkrellmitime/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0e43d4df44699621c645fb9f3523a039 gkrellmitime-1.0.1.ebuild 665
+MD5 e4dca58ea65cf0fd3459bc8492e9ba2a gkrellmitime-1.0.ebuild 629
+MD5 0967bd8ee47104520f387caaaf203e9a gkrellmitime-0.5.1.ebuild 718
+MD5 e19f8a2b6a12d67e8e2235ff1c87b0b1 gkrellmitime-0.4.ebuild 638
+MD5 9333cc36f55308ca12d337cfaf6ff077 ChangeLog 2445
+MD5 503a4f552ef762dc99302f2cd842717c files/digest-gkrellmitime-0.4 67
+MD5 4d00717aa575f50036b0129992917506 files/digest-gkrellmitime-1.0 67
+MD5 efa4b3b7158eaf277dad14da3b096826 files/digest-gkrellmitime-0.5.1 69
+MD5 52f46f069e47ebb97fe755fcb2061acf files/digest-gkrellmitime-1.0.1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCerhGI1lqEGTUzyQRAlagAJ0RtzvMuK6N7T1agpLxIdQ4iWYK3wCcCZrR
+hsnXmDpkYfRzr66UONJNi54=
+=9/hL
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmitime/gkrellmitime-0.4.ebuild b/x11-plugins/gkrellmitime/gkrellmitime-0.4.ebuild
index c82c2aaf4d54..d69154614781 100644
--- a/x11-plugins/gkrellmitime/gkrellmitime-0.4.ebuild
+++ b/x11-plugins/gkrellmitime/gkrellmitime-0.4.ebuild
@@ -1,17 +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-plugins/gkrellmitime/gkrellmitime-0.4.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/gkrellmitime-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${PN}
 DESCRIPTION="Internet Time plugin for Gkrellm"
 SRC_URI="http://eric.bianchi.free.fr/gkrellm/${P}.tar.gz"
-
 HOMEPAGE="http://eric.bianchi.free.fr/gkrellm/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc sparc64"
 
-DEPEND=">=app-admin/gkrellm-1.2.4"
+DEPEND="=app-admin/gkrellm-1.2*"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc "
 
 src_compile() {
 	emake || die
diff --git a/x11-plugins/gkrellmitime/gkrellmitime-0.5.1.ebuild b/x11-plugins/gkrellmitime/gkrellmitime-0.5.1.ebuild
index c69c6fe77a22..b59534e72044 100644
--- a/x11-plugins/gkrellmitime/gkrellmitime-0.5.1.ebuild
+++ b/x11-plugins/gkrellmitime/gkrellmitime-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/gkrellmitime-0.5.1.ebuild,v 1.1 2002/10/16 21:36:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/gkrellmitime-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE="nls"
 DESCRIPTION="Internet Time plugin for Gkrellm"
 SRC_URI="http://eric.bianchi.free.fr/gkrellm/${P}.tar.gz"
 HOMEPAGE="http://eric.bianchi.free.fr/gkrellm/"
@@ -12,7 +12,7 @@ RDEPEND="nls? ( sys-devel/gettext )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~sparc64"
+KEYWORDS="x86 ~sparc "
 
 src_compile() {
 
diff --git a/x11-plugins/gkrellmitime/gkrellmitime-1.0.1.ebuild b/x11-plugins/gkrellmitime/gkrellmitime-1.0.1.ebuild
index b3ee66d02c5f..403e048f934e 100644
--- a/x11-plugins/gkrellmitime/gkrellmitime-1.0.1.ebuild
+++ b/x11-plugins/gkrellmitime/gkrellmitime-1.0.1.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/gkrellmitime-1.0.1.ebuild,v 1.1 2004/01/18 15:37:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/gkrellmitime-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit multilib
+
+IUSE=""
 DESCRIPTION="Internet Time plugin for Gkrellm2"
-SRC_URI="http://eric.bianchi.free.fr/Softwares/${P}.tar.gz"
 HOMEPAGE="http://eric.bianchi.free.fr/gkrellm/"
+SRC_URI="http://eric.bianchi.free.fr/Softwares/${P}.tar.gz"
 
-DEPEND=">=app-admin/gkrellm-2*"
-
-SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+SLOT="2"
+KEYWORDS="x86 ppc sparc alpha amd64"
+
+DEPEND=">=app-admin/gkrellm-2"
 
 src_compile() {
 	make || die
 }
 
-src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+src_install() {
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellm_itime.so
 	dodoc README ChangeLog COPYING
 }
diff --git a/x11-plugins/gkrellmitime/gkrellmitime-1.0.ebuild b/x11-plugins/gkrellmitime/gkrellmitime-1.0.ebuild
index 7973731dac3c..0f448a136b62 100644
--- a/x11-plugins/gkrellmitime/gkrellmitime-1.0.ebuild
+++ b/x11-plugins/gkrellmitime/gkrellmitime-1.0.ebuild
@@ -1,17 +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-plugins/gkrellmitime/gkrellmitime-1.0.ebuild,v 1.1 2002/10/16 21:36:51 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmitime/gkrellmitime-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="Internet Time plugin for Gkrellm2"
 SRC_URI="http://eric.bianchi.free.fr/gkrellm/${P}.tar.gz"
 HOMEPAGE="http://eric.bianchi.free.fr/gkrellm/"
 
-DEPEND=">=app-admin/gkrellm-2.0*"
+DEPEND=">=app-admin/gkrellm-2"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~sparc64"
+KEYWORDS="x86 ~sparc ppc alpha"
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/gkrellmlaunch/ChangeLog b/x11-plugins/gkrellmlaunch/ChangeLog
index edadf2280067..07cf01b03a26 100644
--- a/x11-plugins/gkrellmlaunch/ChangeLog
+++ b/x11-plugins/gkrellmlaunch/ChangeLog
@@ -1,9 +1,41 @@
 # ChangeLog for x11-plugins/gkrellmlaunch
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmlaunch-0.5.ebuild:
+  Stable on amd64.
+
+  09 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellmlaunch-0.5.ebuild:
+  Marked ~amd64.
+
+  21 Jan 2004; Sven Blumenstein <bazik@gentoo.org> gkrellmlaunch-0.5.ebuild:
+  Stable on sparc.
+
+  04 Sep 2003; Aron Griffis <agriffis@gentoo.org> gkrellmlaunch-0.5.ebuild:
+  stable on alpha
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellmlaunch-0.5 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmlaunch-0.5.ebuild
+  files/digest-gkrellmlaunch-0.5 :
+
+  GKrellM2 version submitted by: gustavo@felisberto.net (Gustavo Felisberto)
+  in bug #8926.
+
+*gkrellmlaunch-0.4 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmlaunch-0.4.ebuild
+  files/digest-gkrellmlaunch-0.4 :
+
+  Version bump to bugfix release for the gkrellm1 version.
 
 *gkrellmlaunch-0.3 (23 Feb 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
index e69de29bb2d1..ac82ed9d1ccd 100644
--- a/x11-plugins/gkrellmlaunch/Manifest
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7bcd0580206bad3b459f8f963a0d5ff3 gkrellmlaunch-0.5.ebuild 649
+MD5 6bb3705d4e249a7d03d6c0342dec25ce gkrellmlaunch-0.4.ebuild 612
+MD5 42849c6eaf611240d6969edef98504c9 ChangeLog 1915
+MD5 f5612c6c92732d8c60edc06ddfd1ff2b files/digest-gkrellmlaunch-0.4 68
+MD5 12b4663e40e1867076514714378b834b files/digest-gkrellmlaunch-0.5 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/JA2G5bA0cA/ScRAkVHAJ9Z2ynq3SzGz35AWisxEUT1vZpYMACeNvXt
+w2v5MVE7yIVsOb+6Jp8BbxM=
+=ErPj
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.4.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.4.ebuild
index 9b5db154d1c7..e5ea4373597c 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.4.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.4.ebuild,v 1.1 2002/10/16 22:05:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="a Program-Launcher Plugin for GKrellM"
 SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
 HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
@@ -11,7 +11,7 @@ DEPEND="=app-admin/gkrellm-1.2*"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
 src_compile() {
 	make || die
@@ -21,5 +21,5 @@ src_install () {
 	insinto /usr/lib/gkrellm/plugins
 	doins gkrellmlaunch.so
 
-	dodoc README  
+	dodoc README
 }
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
index 87bac97f242c..455e20807bf6 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild,v 1.1 2002/10/16 22:05:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit multilib
+
+IUSE=""
 DESCRIPTION="a Program-Launcher Plugin for GKrellM2"
 SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
 HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
 
-DEPEND="=app-admin/gkrellm-2.0*"
+DEPEND="=app-admin/gkrellm-2*"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 src_compile() {
 	make || die
 }
 
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellmlaunch.so
 
-	dodoc README  
+	dodoc README
 }
diff --git a/x11-plugins/gkrellmms/ChangeLog b/x11-plugins/gkrellmms/ChangeLog
index e1f2841514ca..6b46fbfea151 100644
--- a/x11-plugins/gkrellmms/ChangeLog
+++ b/x11-plugins/gkrellmms/ChangeLog
@@ -1,9 +1,177 @@
 # ChangeLog for x11-plugins/gkrellmms
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gkrellmms-2.1.21.ebuild:
+  Stable on ppc.
+
+*gkrellmms-2.1.22 (18 May 2005)
+
+  18 May 2005; Martin Holzer <mholzer@gentoo.org> +gkrellmms-2.1.22.ebuild:
+  Version bumped. Closes 82738. Thx to <andrewdk@sbcglobal.net>
+
+  14 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gkrellmms-2.1.21.ebuild:
+  Stable on alpha.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> gkrellmms-2.1.15.ebuild,
+  gkrellmms-2.1.21.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmms-2.1.21.ebuild:
+  multilib fixes
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> gkrellmms-2.1.21.ebuild:
+  stable on amd64
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gkrellmms-2.1.21.ebuild:
+  Stable on sparc
+
+  28 Mar 2005; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.21.ebuild:
+  x86 stable.
+
+*gkrellmms-2.1.21 (02 Jan 2005)
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org> +gkrellmms-2.1.21.ebuild:
+  Version bumped. Closes 74001
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gkrellmms-2.1.15.ebuild:
+  Stable on alpha.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> gkrellmms-0.5.6.ebuild,
+  gkrellmms-0.5.8.ebuild:
+  Typo in DESCRIPTION: controll -> control. Bug 59717.
+
+*gkrellmms-2.1.20 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.20.ebuild:
+  Version bumped. Closes 51471
+
+*gkrellmms-2.1.19 (09 May 2004)
+
+  09 May 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.19.ebuild:
+  Version bumped. Closes 49915
+
+*gkrellmms-2.1.18 (08 May 2004)
+
+  08 May 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.15.ebuild,
+  gkrellmms-2.1.17.ebuild, gkrellmms-2.1.18.ebuild:
+  Version bumped. Added missing IUSE.
+
+*gkrellmms-2.1.17 (02 May 2004)
+
+  02 May 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.17.ebuild:
+  verison bumped. closes 49605
+
+  29 Apr 2004; Jason Wever <weeve@gentoo.org> gkrellmms-2.1.15.ebuild:
+  Stable on sparc.
+
+*gkrellmms-2.1.16 (17 Apr 2004)
+
+  17 Apr 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.16.ebuild:
+  Version bumped. Closes 45762
+
+  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellmms-2.1.15.ebuild:
+  Added IUSE, stable on x86 and amd64.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellmms-2.1.14.ebuild:
+  Stable on x86 and amd64, adding IUSE.
+
+*gkrellmms-2.1.15 (16 Mar 2004)
+
+  16 Mar 2004; Jon Portnoy <avenj@gentoo.org> gkrellmms-2.1.15.ebuild :
+  Version bump.
+
+  01 Mar 2004; Markus Nigbur <pyrania@gentoo.org> gkrellmms-2.1.13.ebuild:
+  Stable on x86.
+
+*gkrellmms-2.1.14 (28 Feb 2004)
+
+  28 Feb 2004; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.14.ebuild:
+  Version bumped. Closes 42832
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org> gkrellmms-2.1.13.ebuild:
+  Stable on sparc.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellmms-2.1.12.ebuild:
+  stable on alpha
+
+*gkrellmms-2.1.13 (06 Dec 2003)
+
+  06 Dec 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.13.ebuild:
+  Version bumped.
+
+  07 Oct 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-0.5.6.ebuild,
+  gkrellmms-0.5.8.ebuild:
+  changed depend to gkrellm fixed version. Closes #27060.
+
+  04 Sep 2003; Aron Griffis <agriffis@gentoo.org> gkrellmms-2.1.12.ebuild:
+  add ~alpha to KEYWORDS
+
+  17 Jul 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.12.ebuild,
+  gkrellmms-0.5.8.ebuild :
+  Marked x86 stable.
+
+*gkrellmms-2.1.12 (25 Jun 2003)
+
+  25 Jun 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.12.ebuild:
+  Version bumped. Closes #23155
+
+*gkrellmms-2.1.9 (23 Mar 2003)
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.9.ebuild:
+  Version bumped.
+
+*gkrellmms-2.1.8 (19 Feb 2003)
+
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.8.ebuild
+  files/digest-gkrellmms-2.1.8 :
+  Version bumped.
+
+*gkrellmms-2.1.6 (16 Jan 2003)
+
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> gkrellmms-2.1.6.ebuild :
+  Marking as stable.
+
+  16 Jan 2003; Seemant Kulleen <seemant@gentoo.org> gkrellmms-2.1.6.ebuild
+  files/digest-gkrellmms-2.1.6 :
+
+  Version bump thanks to: mail@slysoft.de (Thomas Arnhold) in bug #13847.
+
+*gkrellmms-2.1.3 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmms-2.1.3.ebuild
+  files/digest-gkrellmms-2.1.3 :
+
+  Version bump.  Added to ~ppc profile as well.
+
+*gkrellmms-0.5.8 (16 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmms-0.5.8.ebuild
+  files/digest-gkrellmms-0.5.8 :
+
+  Version bump for the gtk+1 version.  both versions are SLOTified,
+  obviously.
+
+*gkrellmms-2.1.2 (15 Oct 2002)
+
+  15 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmms-2.1.2.ebuild
+  files/digest-gkrellmms-2.1.2 :
+
+  New version for gkrellm2 (based on gtk2).  Thanks to:
+  43fcmm6rz001@sneakemail.com (Tobias Quinn) in bug #7362, though this one
+  is a more updated version.  Also, pazzop@wanadoo.nl (AlterEgo) had
+  submitted an ebuild in bug #7384.
 
 *gkrellmms-0.5.6 (27 May 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellmms/Manifest b/x11-plugins/gkrellmms/Manifest
index e69de29bb2d1..94a69bea11ed 100644
--- a/x11-plugins/gkrellmms/Manifest
+++ b/x11-plugins/gkrellmms/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 832c9f70b38243ed07208cf01a547dbe gkrellmms-0.5.6.ebuild 673
+MD5 5501ba1300cfb20d4e05256536ec9a66 gkrellmms-0.5.8.ebuild 663
+MD5 532ae36eb74dbe9c2c51551a4e9ae985 gkrellmms-2.1.15.ebuild 690
+MD5 d6418f7177365fb28c79e30241c07ffb gkrellmms-2.1.21.ebuild 717
+MD5 930bc0fca8c0ca2f17ba9e58d6bfbbb3 gkrellmms-2.1.22.ebuild 832
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 6c93b874a8a11efd4b68126cf9e16cf4 ChangeLog 6342
+MD5 ac569c5ef1a94fe768b2a043f1d5c7c6 files/digest-gkrellmms-0.5.6 66
+MD5 09b80fad84214e723be0b9f8867c4479 files/digest-gkrellmms-0.5.8 66
+MD5 cb1a862a255479deb2b1e80dd39fd1ba files/digest-gkrellmms-2.1.15 67
+MD5 28292acdeda41917477cff7da333acf6 files/digest-gkrellmms-2.1.21 67
+MD5 056d9292c21e2a4480ebe2f739e011b2 files/digest-gkrellmms-2.1.22 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDK/8aKf2g/qXtneoRAo2sAJsGXtOzj9dTVhFpR6MCF1cfubs1OgCeIyCQ
+BVz5x31pMwnldJg3/ymljfo=
+=YOaM
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmms/files/digest-gkrellmms-0.5.8 b/x11-plugins/gkrellmms/files/digest-gkrellmms-0.5.8
index 2dbe56623e94..d7ab7344c0a1 100644
--- a/x11-plugins/gkrellmms/files/digest-gkrellmms-0.5.8
+++ b/x11-plugins/gkrellmms/files/digest-gkrellmms-0.5.8
@@ -1,2 +1 @@
 MD5 c786e5668f5d66e4910b21ff990df9d6 gkrellmms-0.5.8.tar.gz 27580
-MD5 194dcdb798b2b2c9bb21e2a4af9eaaf1 GKrellMMSi-0.1.1.tar.gz 50906
diff --git a/x11-plugins/gkrellmms/gkrellmms-0.5.6.ebuild b/x11-plugins/gkrellmms/gkrellmms-0.5.6.ebuild
index 6cff97a02c14..7fa00bd8292d 100644
--- a/x11-plugins/gkrellmms/gkrellmms-0.5.6.ebuild
+++ b/x11-plugins/gkrellmms/gkrellmms-0.5.6.ebuild
@@ -1,27 +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-plugins/gkrellmms/gkrellmms-0.5.6.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-0.5.6.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${PN}
-DESCRIPTION="A sweet plugin to controll xmms from gkrellm"
+DESCRIPTION="A sweet plugin to control xmms from gkrellm"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellm/Plugins.html"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc sparc64"
 
-DEPEND=">=app-admin/gkrellm-1.2.9
-		>=media-sound/xmms-1.2.4"
+DEPEND="=app-admin/gkrellm-1.2*
+	=media-sound/xmms-1.2*"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc"
 
 src_compile() {
-	
 	emake || die
-
 }
 
 src_install () {
-
 	exeinto /usr/lib/gkrellm/plugins
 	doexe gkrellmms.so
 	dodoc README Changelog FAQ Themes
diff --git a/x11-plugins/gkrellmms/gkrellmms-0.5.8.ebuild b/x11-plugins/gkrellmms/gkrellmms-0.5.8.ebuild
index 753483d36332..660dffdcdb40 100644
--- a/x11-plugins/gkrellmms/gkrellmms-0.5.8.ebuild
+++ b/x11-plugins/gkrellmms/gkrellmms-0.5.8.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-0.5.8.ebuild,v 1.1 2002/10/16 07:50:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-0.5.8.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${PN}
-DESCRIPTION="A sweet plugin to controll xmms from gkrellm"
+DESCRIPTION="A sweet plugin to control xmms from gkrellm"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellmms.phtml"
 
-DEPEND=">=app-admin/gkrellm-1.2*
+DEPEND="=app-admin/gkrellm-1.2*
 	media-sound/xmms"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+KEYWORDS="x86 ppc ~sparc"
 
 src_compile() {
 	emake || die
diff --git a/x11-plugins/gkrellmms/gkrellmms-2.1.15.ebuild b/x11-plugins/gkrellmms/gkrellmms-2.1.15.ebuild
index 470053b8a0f8..03540a34919c 100644
--- a/x11-plugins/gkrellmms/gkrellmms-2.1.15.ebuild
+++ b/x11-plugins/gkrellmms/gkrellmms-2.1.15.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.15.ebuild,v 1.1 2004/03/17 00:48:14 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.15.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A sweet plugin to control XMMS from GKrellM2"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellmms.phtml"
-
-DEPEND=">=app-admin/gkrellm-2*
+IUSE=""
+DEPEND=">=app-admin/gkrellm-2
 	media-sound/xmms"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 src_compile() {
 	emake || die
diff --git a/x11-plugins/gkrellmms/gkrellmms-2.1.21.ebuild b/x11-plugins/gkrellmms/gkrellmms-2.1.21.ebuild
index 0307d0004717..a9a54c0e2463 100644
--- a/x11-plugins/gkrellmms/gkrellmms-2.1.21.ebuild
+++ b/x11-plugins/gkrellmms/gkrellmms-2.1.21.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.21.ebuild,v 1.1 2005/01/02 02:06:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.21.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+inherit multilib
 
-IUSE=""
 S=${WORKDIR}/${PN}
 DESCRIPTION="A sweet plugin to control XMMS from GKrellM2"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellmms.phtml"
 IUSE=""
-DEPEND=">=app-admin/gkrellm-2*
+DEPEND=">=app-admin/gkrellm-2
 	media-sound/xmms"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 src_compile() {
 	emake || die
 }
 
 src_install () {
-	exeinto /usr/lib/gkrellm2/plugins
+	exeinto /usr/$(get_libdir)/gkrellm2/plugins
 	newexe gkrellmms.so gkrellmms2.so
 	dodoc README Changelog FAQ Themes
 }
diff --git a/x11-plugins/gkrellmms/gkrellmms-2.1.22.ebuild b/x11-plugins/gkrellmms/gkrellmms-2.1.22.ebuild
index 04afe998fe53..33c8b7470c37 100644
--- a/x11-plugins/gkrellmms/gkrellmms-2.1.22.ebuild
+++ b/x11-plugins/gkrellmms/gkrellmms-2.1.22.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.22.ebuild,v 1.1 2005/05/18 21:34:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmms/gkrellmms-2.1.22.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 inherit multilib
 
-IUSE="bmp"
 S=${WORKDIR}/${PN}
 DESCRIPTION="A sweet plugin to control XMMS from GKrellM2"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellmms.phtml"
-IUSE=""
+IUSE="bmp"
 DEPEND=">=app-admin/gkrellm-2
 	!bmp? ( media-sound/xmms )
 	bmp? ( media-sound/beep-media-player )"
diff --git a/x11-plugins/gkrellmoon/ChangeLog b/x11-plugins/gkrellmoon/ChangeLog
index 8bec6ac14d7f..7c916b62e749 100644
--- a/x11-plugins/gkrellmoon/ChangeLog
+++ b/x11-plugins/gkrellmoon/ChangeLog
@@ -1,9 +1,38 @@
 # ChangeLog for x11-plugins/gkrellmoon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmoon/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmoon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmoon-0.6.ebuild:
+  multilib fixes
+
+  16 Mar 2004; <augustus@gentoo.org> gkrellmoon-0.6.ebuild:
+  Marked for AMD64.
+
+  04 Sep 2003; Aron Griffis <agriffis@gentoo.org> gkrellmoon-0.6.ebuild:
+  stable on alpha
+
+*gkrellmoon-0.6 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmoon-0.6.ebuild
+  files/digest-gkrellmoon-0.6 :
+
+  Cosmetic upstream fixes.   Nothing major, so bumping to stable.
+
+*gkrellmoon-0.5 (10 Nov 2002)
+ 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  10 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gkrellmoon-0.5.ebuild
+  files/digest-gkrellmoon-0.5.ebuild :
+
+  New version for GkrellM2. Thanks to: absinthe@pobox.com (Dylan Carlson) in
+  bug #10528
 
 *gkrellmoon-0.3 (19 Feb 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellmoon/Manifest b/x11-plugins/gkrellmoon/Manifest
index e69de29bb2d1..337af1269306 100644
--- a/x11-plugins/gkrellmoon/Manifest
+++ b/x11-plugins/gkrellmoon/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4c83f53d4c88a5bf73f21dd94eb87635 gkrellmoon-0.6.ebuild 702
+MD5 b9356d54c6d24565c37463d7c3aa3321 ChangeLog 1353
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 8a609e41089285f7d58fb47c22ac80aa files/digest-gkrellmoon-0.6 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb/Bk2G5bA0cA/ScRAiwrAJ43cOWT0Rp/K6sOBEtRUSo1RTJ3eACg6gW9
+xjB2wKshAFMkzcX98liI2B4=
+=g4cN
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6.ebuild
index cbe75186d806..3a314cc53bbd 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmoon/gkrellmoon-0.6.ebuild,v 1.1 2002/12/14 21:57:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmoon/gkrellmoon-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit multilib
+
+IUSE=""
 DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
 SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 HOMEPAGE="http://gkrellmoon.sourceforge.net/"
@@ -12,15 +14,14 @@ DEPEND="=app-admin/gkrellm-2*
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 src_compile() {
 	emake || die
 }
 
 src_install () {
-
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellmoon.so
 	dodoc README AUTHORS COPYING ChangeLog
 }
diff --git a/x11-plugins/gkrellmouse/ChangeLog b/x11-plugins/gkrellmouse/ChangeLog
index 196419ede8e5..60697ff102b8 100644
--- a/x11-plugins/gkrellmouse/ChangeLog
+++ b/x11-plugins/gkrellmouse/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for x11-plugins/gkrellmouse
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmouse/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmouse/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellmouse-0.0.2 (26 Apr 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellmouse/Manifest b/x11-plugins/gkrellmouse/Manifest
index e69de29bb2d1..3cae4ab862df 100644
--- a/x11-plugins/gkrellmouse/Manifest
+++ b/x11-plugins/gkrellmouse/Manifest
@@ -0,0 +1,3 @@
+MD5 aa2145aacde9e2e3277b5cc7967fe59f gkrellmouse-0.0.2.ebuild 697
+MD5 9fc5be6c3c1bba2d3f423695835e63ee ChangeLog 632
+MD5 b2732478399be50163d9b1fee3928f6b files/digest-gkrellmouse-0.0.2 68
diff --git a/x11-plugins/gkrellmouse/gkrellmouse-0.0.2.ebuild b/x11-plugins/gkrellmouse/gkrellmouse-0.0.2.ebuild
index 0893188882c2..08370c82dd45 100644
--- a/x11-plugins/gkrellmouse/gkrellmouse-0.0.2.ebuild
+++ b/x11-plugins/gkrellmouse/gkrellmouse-0.0.2.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-plugins/gkrellmouse/gkrellmouse-0.0.2.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmouse/gkrellmouse-0.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 MY_P=${P/-/_}
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="A Gkrellm plugin that tracks the total distance of mouse movements"
 SRC_URI="http://ssl.usu.edu/paul/gkrellmouse/${MY_P}.tar.gz"
 HOMEPAGE="http://ssl.usu.edu/paul/gkrellmouse"
-LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc "
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-	=x11-libs/gtk+-1.2*
+DEPEND="=app-admin/gkrellm-1.2*
 	>=media-libs/imlib-1.9.10-r1"
 
 src_compile() {
diff --git a/x11-plugins/gkrellmss/ChangeLog b/x11-plugins/gkrellmss/ChangeLog
index b1a30748beff..7fe83547dd3b 100644
--- a/x11-plugins/gkrellmss/ChangeLog
+++ b/x11-plugins/gkrellmss/ChangeLog
@@ -1,9 +1,56 @@
-# ChangeLog for x11-plugins/gkrelmss
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/ChangeLog,v 1.1 2003/02/12 10:44:27 seemant Exp $
+# ChangeLog for x11-plugins/gkrellmss
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmss-2.6.ebuild:
+  multilib fixes
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmss-2.4.ebuild:
+  Stable on amd64.
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org> +gkrellmss-2.6.ebuild:
+  Version bumped. Ebuild submitted by Kai Zimmermann
+  <kai@rrz-raisdorf.de> in 51479.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellmss-2.3.ebuild, gkrellmss-2.4.ebuild:
+  Masked gkrellmss-2.4.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellmss-2.3.ebuild:
+  Masked gkrellmss-2.3.ebuild stable for ppc
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellmss-2.4.ebuild:
+  Marked ~amd64.
+
+  03 Jul 2004; <pyrania@gentoo.org> gkrellmss-2.4.ebuild:
+  Fixed ALSA check sandbox violation. See bug #44408.
+
+  19 Jun 2004; <pyrania@gentoo.org> gkrellmss-2.4.ebuild:
+  Stable on x86.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellmss-2.4.ebuild:
+  Removing S=
+
+*gkrellmss-2.4 (06 Mar 2004)
+
+  06 Mar 2004; Martin Holzer <mholzer@gentoo.org> gkrellmss-2.4.ebuild:
+  Verison bumped. Closes 42833
+
+  03 Mar 2004; Martin Holzer <mholzer@gentoo.org> gkrellmss-2.3.ebuild:
+  adding restricter depend. closes 43575
+
+  01 Mar 2004; Markus Nigbur <pyrania@gentoo.org> gkrellmss-2.3.ebuild:
+  Stable on x86.
+
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellmss-2.3.ebuild:
+  add ~alpha
 
 *gkrellmss-2.3 (12 Feb 2003)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> gkrellmss-2.3.ebuild:
+  Automated cleanup of LICENSE
+
   12 Feb 2003; Seemant Kulleen <seemant@gentoo.org> ChangeLog
   gkrellmss-2.3.ebuild files/gkrellmss-2.3-gentoo.diff
   files/digest-gkrellmss-2.3 :
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index e69de29bb2d1..685d6e42d117 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 073c7a0c3bc2582353827224033418d1 gkrellmss-2.3.ebuild 877
+MD5 a61d177bac9178beb7028f6f57031797 gkrellmss-2.4.ebuild 896
+MD5 05ed01ebd981c2aca52c610387786ab7 gkrellmss-2.6.ebuild 873
+MD5 0aff44634a37ba059b4804d90f439527 ChangeLog 2025
+MD5 cb282a2d5fa1b98ccf24d938b8e6f5b5 files/gkrellmss-patch-2.3.diff 638
+MD5 09497dcbb9e774c8877917883664d32f files/digest-gkrellmss-2.3 64
+MD5 b8c81246004604e8025ec4ffc720a6e3 files/digest-gkrellmss-2.4 64
+MD5 82792daa85820a9eb97f6277f31111cb files/digest-gkrellmss-2.6 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCzRW4BXaUFmZvwyMRAsqcAJ9+jwwmFr7l2EowOC3AzZOD4w1J5ACgsq32
+fff1zgGNC5cRqVassUCIvIg=
+=4saF
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
index 36f58d579660..7c6d8e5d6929 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.3.ebuild
@@ -1,23 +1,22 @@
-# Copyright 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.1 2003/02/12 10:44:27 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 inherit eutils
 
 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://gkrellm.net/gkrellmss/${P}.tar.gz"
+SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
 
 DEPEND="=app-admin/gkrellm-2*
-	dev-libs/fftw
+	=sci-libs/fftw-2*
 	media-sound/esound"
 
 SLOT="0"
-LICENSE="GPL"
-KEYWORDS="~x86 ~ppc ~sparc"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc ~sparc ~alpha"
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.4.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.4.ebuild
index 74117bc5ac07..c2eed0719c18 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.4.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.4.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/gkrellmss-2.4.ebuild,v 1.1 2004/03/06 18:42:10 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/gkrellmss-2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 inherit eutils
 
 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/gkrellmss/${P}.tar.gz"
 
 DEPEND="=app-admin/gkrellm-2*
-	=dev-libs/fftw-2*
+	=sci-libs/fftw-2*
 	media-sound/esound"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc ~sparc ~alpha amd64"
 
 src_unpack() {
 	unpack ${A}
@@ -31,6 +30,7 @@ src_compile() {
 
 	use nls && myconf="${myconf} enable_nls=1"
 
+	addpredict /dev/snd
 	emake ${myconf} || die
 }
 
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6.ebuild
index b0a7ce46cbd8..89dc79c714c2 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/gkrellmss-2.6.ebuild,v 1.1 2005/01/02 02:13:45 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/gkrellmss-2.6.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 inherit eutils
 
-IUSE="nls"
+IUSE="alsa esd nls"
 
 DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
 HOMEPAGE="http://gkrellm.net/gkrellmss/gkrellmss.html"
@@ -29,7 +29,7 @@ src_compile() {
 }
 
 src_install () {
-	exeinto /usr/lib/gkrellm2/plugins
+	exeinto /usr/$(get_libdir)/gkrellm2/plugins
 	doexe src/gkrellmss.so
 	dodoc README Changelog Themes
 }
diff --git a/x11-plugins/gkrellmwho/ChangeLog b/x11-plugins/gkrellmwho/ChangeLog
index 67ac34db0ec3..58de15b02332 100644
--- a/x11-plugins/gkrellmwho/ChangeLog
+++ b/x11-plugins/gkrellmwho/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for x11-plugins/gkrellmwho
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwho/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwho/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellmwho-0.4.ebuild:
+  stable on alpha
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellmwho-0.4 (19 Feb 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellmwho/Manifest b/x11-plugins/gkrellmwho/Manifest
index e69de29bb2d1..ed4edbfacd2b 100644
--- a/x11-plugins/gkrellmwho/Manifest
+++ b/x11-plugins/gkrellmwho/Manifest
@@ -0,0 +1,3 @@
+MD5 f643f23b086e24cebe00f3c55a721286 ChangeLog 742
+MD5 4e7ffc1779163aa21375281c939d1709 gkrellmwho-0.4.ebuild 629
+MD5 bbe575c8440c802707e86a819bc66e65 files/digest-gkrellmwho-0.4 64
diff --git a/x11-plugins/gkrellmwho/gkrellmwho-0.4.ebuild b/x11-plugins/gkrellmwho/gkrellmwho-0.4.ebuild
index cc34c2b033ae..eedca8bfe8dc 100644
--- a/x11-plugins/gkrellmwho/gkrellmwho-0.4.ebuild
+++ b/x11-plugins/gkrellmwho/gkrellmwho-0.4.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-plugins/gkrellmwho/gkrellmwho-0.4.ebuild,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwho/gkrellmwho-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="GKrellM plugin which displays users logged in"
 SRC_URI="http://web.wt.net/~billw/gkrellm/Plugins/${P}.tar.gz"
 HOMEPAGE="http://web.wt.net/~billw/gkrellm/Plugins"
-LICENSE="LGPL-2.1"
+
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+LICENSE="LGPL-2.1"
+KEYWORDS="x86 ppc sparc alpha"
 
-DEPEND=">=app-admin/gkrellm-1.0.6"
+DEPEND="=app-admin/gkrellm-1.2*"
 
 src_compile() {
 	emake || die
@@ -19,5 +20,5 @@ src_compile() {
 src_install () {
 	insinto /usr/lib/gkrellm/plugins
 	doins gkrellmwho.so
-	dodoc README 
+	dodoc README
 }
diff --git a/x11-plugins/gkrellmwho2/ChangeLog b/x11-plugins/gkrellmwho2/ChangeLog
index 64e716c62b97..73b7574b014e 100644
--- a/x11-plugins/gkrellmwho2/ChangeLog
+++ b/x11-plugins/gkrellmwho2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/gkrellmwho2
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwho2/ChangeLog,v 1.1 2004/01/18 15:47:40 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwho2/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> gkrellmwho2-0.2.8.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellmwho2-0.2.8.ebuild:
+  multilib fixes
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellmwho2-0.2.8.ebuild:
+  Marked ~amd64.
 
 *gkrellmwho2-0.2.8 (18 Jan 2004)
 
diff --git a/x11-plugins/gkrellmwho2/Manifest b/x11-plugins/gkrellmwho2/Manifest
index 9a38707a081d..ef2124e7d4b8 100644
--- a/x11-plugins/gkrellmwho2/Manifest
+++ b/x11-plugins/gkrellmwho2/Manifest
@@ -1,7 +1,14 @@
-MD5 4408587a00b305cb8b0cf1b9e248e269 ChangeLog 1549
-MD5 8efa7787f7cba13580225f1e0bb70ba9 gkrellmwho2-0.2.8.ebuild 748
-MD5 503a4f552ef762dc99302f2cd842717c files/digest-gkrellmitime-0.4 67
-MD5 efa4b3b7158eaf277dad14da3b096826 files/digest-gkrellmitime-0.5.1 69
-MD5 4d00717aa575f50036b0129992917506 files/digest-gkrellmitime-1.0 67
-MD5 52f46f069e47ebb97fe755fcb2061acf files/digest-gkrellmitime-1.0.1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 52e535264fa2f7203aab09784e720bb3 gkrellmwho2-0.2.8.ebuild 828
+MD5 af27f42b1f310cf464a3ba2c45deb6db ChangeLog 689
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
 MD5 f53ce7fd6f861503148d7178b101abec files/digest-gkrellmwho2-0.2.8 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCeriTI1lqEGTUzyQRAuYBAKDJ8/0pN4vGat7tsCTmw84DS8EO7wCglgH9
+H01f7FOHXouPSgc2SUjqMxY=
+=Uur8
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmwho2/gkrellmwho2-0.2.8.ebuild b/x11-plugins/gkrellmwho2/gkrellmwho2-0.2.8.ebuild
index 3936db952f84..8fd61c4b61ac 100644
--- a/x11-plugins/gkrellmwho2/gkrellmwho2-0.2.8.ebuild
+++ b/x11-plugins/gkrellmwho2/gkrellmwho2-0.2.8.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwho2/gkrellmwho2-0.2.8.ebuild,v 1.1 2004/01/18 15:47:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwho2/gkrellmwho2-0.2.8.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
+inherit multilib
+
+IUSE=""
 S=${WORKDIR}/${P}.orig
 DESCRIPTION="This plugin displays currently logged in users in the scrolling line. It also shows number of logins for each username and may show idle status"
 SRC_URI="http://shisha.spb.ru/debian/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="http://shisha.spb.ru/projects/GkrellmWHO2"
 
-DEPEND=">=app-admin/gkrellm-2*"
+DEPEND=">=app-admin/gkrellm-2"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 
 src_compile() {
-	pwd
-	ls
+# Eh? --slarti
+#	pwd
+#	ls
 	econf || die
 	emake || die
 }
 
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellmwho2.so
 	dodoc README ChangeLog COPYING
 }
diff --git a/x11-plugins/gkrellmwireless/ChangeLog b/x11-plugins/gkrellmwireless/ChangeLog
index 334701ddf934..f754ccb12ab5 100644
--- a/x11-plugins/gkrellmwireless/ChangeLog
+++ b/x11-plugins/gkrellmwireless/ChangeLog
@@ -1,9 +1,79 @@
 # ChangeLog for x11-plugins/gkrellmwireless
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwireless/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwireless/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+  10 Jul 2005; <brix@gentoo.org> gkrellmwireless-0.2.2.ebuild,
+  gkrellmwireless-2.0.2.ebuild:
+  Keyworded ~sparc under seal of approval from the sparc high council (due to
+  wireless-tools dep, bug #26955).
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  gkrellmwireless-2.0.3.ebuild:
+  multilib fixes
+
+  01 Apr 2005; Homer Parker <hparker@gentoo.org> gkrellmwireless-2.0.3.ebuild:
+  Added ~amd64 closing bug 86864
+
+  15 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> gkrellmwireless-2.0.3.ebuild:
+  Stable on x86.
+
+*gkrellmwireless-2.0.3 (31 Jan 2004)
+
+  31 Jan 2004; Martin Holzer <mholzer@gentoo.org>
+  gkrellmwireless-2.0.3.ebuild:
+  Version bumped. Closes 38337
+
+  21 Jan 2004; Sven Blumenstein <bazik@gentoo.org>
+  gkrellmwireless-2.0.2.ebuild:
+  Stable on sparc.
+
+*gkrellmwireless-0.2.2 (23 Mar 2003)
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellmwireless-0.2.2.ebuild, gkrellmwireless-2.0.0.ebuild,
+  gkrellmwireless-2.0.1.ebuild, gkrellmwireless-2.0.2.ebuild:
+  --help
+
+*gkrellmwireless-2.0.2 (23 Mar 2003)
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  gkrellmwireless-0.2.2.ebuild, gkrellmwireless-2.0.0.ebuild,
+  gkrellmwireless-2.0.1.ebuild, gkrellmwireless-2.0.2.ebuild:
+  Moved from net-wireless to x11-plugins
+
+*gklrellmwireless-2.0.1 (14 Dec 2002)
+
+  14 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellmwireless-2.0.1.ebuild files/digest-gkrellmwireless-2.0.1 :
+
+  Version bump.
+
+*gkrellmwireless-2.0.0 (16 Oct 2002) 
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  11 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellmwireless-2.0.0.ebuild : 
+
+  Moved to stable x86.  Tom Prado among others have been testing since
+  release.
+
+  03 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellmwireless-2.0.0.ebuild :
+
+  Changed to DEPEND on =gkrellm-2*. Thanks to chadh@gentoo.org in bug #11550
+
+  31 Oct 2002; Hannes Mehnert <hannes@gentoo.org>:
+  moved to net-wireless
+
+  16 Oct 2002; Spider <spider@gentoo.org> gkrellmwireless-2.0.0.ebuild :
+  Added a wireless monitor for gkrellm2 , using  ~arch 
+  
 *gkrelmmwireless-0.2.2 (14 Apr 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellmwireless/Manifest b/x11-plugins/gkrellmwireless/Manifest
index e69de29bb2d1..5fbffafab08e 100644
--- a/x11-plugins/gkrellmwireless/Manifest
+++ b/x11-plugins/gkrellmwireless/Manifest
@@ -0,0 +1,7 @@
+MD5 b5f86799cdcaca53bbaf34f723be8ce7 gkrellmwireless-2.0.2.ebuild 682
+MD5 acb44e3ec80a5c934906f9b6c360fd16 gkrellmwireless-0.2.2.ebuild 703
+MD5 a53b439a70e5f2a197ed0c7e662bf8db ChangeLog 3082
+MD5 0c5e33c8b3a5c35d192152a32a6007f6 gkrellmwireless-2.0.3.ebuild 718
+MD5 e84b1204cacc43c4e51aeb705b81602f files/digest-gkrellmwireless-0.2.2 71
+MD5 300c3609b079066884f9f19ad56bb580 files/digest-gkrellmwireless-2.0.2 71
+MD5 f151e44fd464be109f592f28637a7ad3 files/digest-gkrellmwireless-2.0.3 71
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-0.2.2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-0.2.2.ebuild
index f7719da54f55..39f96ce6231c 100644
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-0.2.2.ebuild
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-0.2.2.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwireless/gkrellmwireless-0.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 # 26 Apr 2001 21:30 CST blutgens Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/"
-LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+LICENSE="GPL-2"
+KEYWORDS="ppc ~sparc x86"
 
-DEPEND=">=app-admin/gkrellm-1.2.9"
+DEPEND="=app-admin/gkrellm-1.2*"
 
 src_compile() {
 	export PATH="${PATH}:/usr/X11R6/bin"
@@ -20,7 +21,6 @@ src_compile() {
 }
 
 src_install () {
-
 	insinto /usr/lib/gkrellm/plugins
 	doins wireless.so
 	dodoc README Changelog
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.2.ebuild
index 36847f6d72f1..6af252d6d275 100644
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.2.ebuild
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.2.ebuild,v 1.1 2003/03/23 16:32:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${PN}
 DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
@@ -9,7 +10,7 @@ HOMEPAGE="http://gkrellm.luon.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc "
+KEYWORDS="ppc ~sparc x86"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild
index 20b15aa9ad8e..0ef00e035dd9 100644
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild,v 1.1 2004/01/31 22:53:06 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+inherit multilib
+
+IUSE=""
 S=${WORKDIR}/${PN}
 DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
@@ -9,7 +12,7 @@ HOMEPAGE="http://gkrellm.luon.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 DEPEND="=app-admin/gkrellm-2*"
 
@@ -21,7 +24,7 @@ src_compile() {
 }
 
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins wireless.so
 	dodoc README Changelog
 }
diff --git a/x11-plugins/gkrellshoot/ChangeLog b/x11-plugins/gkrellshoot/ChangeLog
index c2a6919945f1..46ec8166750f 100644
--- a/x11-plugins/gkrellshoot/ChangeLog
+++ b/x11-plugins/gkrellshoot/ChangeLog
@@ -1,9 +1,61 @@
 # ChangeLog for x11-plugins/gkrellshoot
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gkrellshoot-0.4.1.ebuild:
+  Mark 0.4.1 stable on alpha
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> gkrellshoot-0.4.1.ebuild,
+  gkrellshoot-0.4.3.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellshoot-0.4.1.ebuild:
+  Stable on amd64.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellshoot-0.4.3.ebuild:
+  multilib fixes
+
+*gkrellshoot-0.4.3 (02 Jan 2005)
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org> +gkrellshoot-0.4.3.ebuild:
+  Version bumped. Closes 74000
+
+  13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> gkrellshoot-0.4.1.ebuild:
+  marked ~amd64
+
+  13 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  gkrellshoot-0.4.1.ebuild:
+  rdepend on media-gfx/imagemagick (bug #47654); use emake; tidy
+
+  29 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> gkrellshoot-0.4.1.ebuild:
+  Stable on sparc
+
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellshoot-0.4.1.ebuild:
+  add ~alpha
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+
+*gkrellshoot-0.4.1 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellshoot-0.4.1.ebuild
+  files/digest-gkrellshoot-0.4.1 :
+
+  SLOTified version for gkrellm2 submitted by: gustavo@felisberto.net
+  (Gustavo Felisberto) in bug #8926.
+
+*gkrellshoot-0.3.2 (16 Oct 2002)
+
+  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellshoot-0.3.2.ebuild
+  files/digest-gkrellshoot-0.3.2 :
+
+  Bugfix version bump for gkrellm1
 
 *gkrellshoot-0.3.11 (10 Jun 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index e69de29bb2d1..4920322fbe81 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -0,0 +1,7 @@
+MD5 b0f86d28973675a3d7a88e93782f1023 ChangeLog 2345
+MD5 a4938b72df3a15af2f29b59bdb567aa4 gkrellshoot-0.3.2.ebuild 792
+MD5 2119377f02c2abc59a4ed5227fd5c0da gkrellshoot-0.4.1.ebuild 771
+MD5 cc993fd4202c209eabcf314c62c3e617 gkrellshoot-0.4.3.ebuild 803
+MD5 f23fea3e8df4c393b9d16c4ccfbcf244 files/digest-gkrellshoot-0.4.3 68
+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.3.2.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.3.2.ebuild
index 4dec2ab2fb64..4699d38702f2 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.3.2.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.3.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/gkrellshoot-0.3.2.ebuild,v 1.1 2002/10/16 21:59:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/gkrellshoot-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${P/s/S}
 DESCRIPTION="A GKrellM plugin to snap screenshots."
 SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
@@ -9,7 +10,7 @@ HOMEPAGE="http://gkrellshoot.sf.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc "
 
 DEPEND="=app-admin/gkrellm-1.2*
 	>=media-libs/imlib-1.9.10-r1"
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild
index a848ddc731da..86968d8918d0 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild
@@ -1,23 +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-plugins/gkrellshoot/gkrellshoot-0.4.1.ebuild,v 1.1 2002/10/16 21:59:01 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 S=${WORKDIR}/${P/s/S}
 DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gkrellshoot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
 
-DEPEND=">=app-admin/gkrellm-2.0*"	
-
-SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~sparc64"
+SLOT="2"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="=x11-libs/gtk+-2*
+	>=app-admin/gkrellm-2"
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick"
 
 src_compile() {
-	
 	export CFLAGS="${CFLAGS/-O?/}"
-
-	make || die
+	emake || die "emake failed"
 }
 
 src_install () {
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.3.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.3.ebuild
index 83d5e5a60fd9..76015d4c94c4 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.3.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/gkrellshoot-0.4.3.ebuild,v 1.1 2005/01/02 01:59:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellshoot/gkrellshoot-0.4.3.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+inherit multilib
 
 S=${WORKDIR}/${P/s/S}
 DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
@@ -13,7 +15,7 @@ KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~ppc"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-2*
-	>=app-admin/gkrellm-2*"
+	>=app-admin/gkrellm-2"
 RDEPEND="${DEPEND}
 	media-gfx/imagemagick"
 
@@ -23,7 +25,7 @@ src_compile() {
 }
 
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellshoot.so
 	dodoc README ChangeLog
 }
diff --git a/x11-plugins/gkrellstock/ChangeLog b/x11-plugins/gkrellstock/ChangeLog
index 9398cbbe912f..bf1808f438b6 100644
--- a/x11-plugins/gkrellstock/ChangeLog
+++ b/x11-plugins/gkrellstock/ChangeLog
@@ -1,7 +1,21 @@
 # ChangeLog for x11-plugins/gkrellstock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/ChangeLog,v 1.1 2002/10/30 23:42:55 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+  06 May 2005; Sven Wegener <swegener@gentoo.org> gkrellstock-0.5.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellstock-0.5.ebuild:
+  Stable on amd64.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellstock-0.5.ebuild:
+  multilib fixes
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> :
+  Marked ~amd64.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gkrellstock-0.5 (30 Oct 2002)
 
   30 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellstock-0.5.ebuild
diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
index e69de29bb2d1..eb67380d49ff 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 95d79bd0d8491f18b358369a72b643a2 gkrellstock-0.4.ebuild 723
+MD5 20e096d4514dd63f00b5d9e6117cfd4a gkrellstock-0.5.ebuild 755
+MD5 ef79a9fe494cc739ad54012a450c4912 ChangeLog 1159
+MD5 39486a7dd45163fa00f17106b8588ecf files/digest-gkrellstock-0.4 66
+MD5 21a515056c296f8cc9cdba966f4d8550 files/digest-gkrellstock-0.5 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCerkkI1lqEGTUzyQRAne0AKCyBrjgn8TdjVlR8/M+49JCc3xnwgCgq/qK
+0XHQ4YEF72r0MtEMfzMxsgQ=
+=ASlh
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild
index 1b01baeafc18..6da51dd6a683 100644
--- a/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild
+++ b/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild
@@ -1,19 +1,20 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.4.ebuild,v 1.1 2002/10/30 23:42:55 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+IUSE=""
 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*
 	dev-perl/libwww-perl
-	dev-perl/Finance-Quote"	
+	dev-perl/Finance-Quote"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc ppc"
 
 src_compile() {
 	emake || die
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild
index fa55c4f2f1c4..20ab5eba9630 100644
--- a/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild
@@ -1,28 +1,31 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.5.ebuild,v 1.1 2002/10/30 23:42:55 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+inherit multilib
+
+IUSE=""
 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*
+DEPEND=">=app-admin/gkrellm-2
 	dev-perl/libwww-perl
-	dev-perl/Finance-Quote"	
+	dev-perl/Finance-Quote"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc ppc amd64"
 
 src_compile() {
 	emake || die
 }
 
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellstock.so
-	exeinto /usr/X11R6/bin
+	exeinto /usr/bin
 	doexe GetQuote2
 	dodoc README ChangeLog COPYING
 }
diff --git a/x11-plugins/gkrellsun/ChangeLog b/x11-plugins/gkrellsun/ChangeLog
index 14c1522e96ca..d6ca8b0e2ac8 100644
--- a/x11-plugins/gkrellsun/ChangeLog
+++ b/x11-plugins/gkrellsun/ChangeLog
@@ -1,9 +1,58 @@
 # ChangeLog for x11-plugins/gkrellsun
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gkrellsun-0.12.1.ebuild:
+  Mark 0.12.1 stable on alpha
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellsun-0.12.2.ebuild:
+  multilib fixes
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> gkrellsun-0.12.1.ebuild:
+  stable on ia64
+
+*gkrellsun-0.12.2 (22 Jan 2005)
+
+  22 Jan 2005; Lars Weiler <pylon@gentoo.org> +gkrellsun-0.12.2.ebuild:
+  Version bump.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrellsun-0.12.1.ebuild:
+  Masked gkrellsun-0.12.1.ebuild stable for ppc
+
+*gkrellsun-0.12.1 (20 Jul 2004)
+
+  20 Jul 2004; Martin Holzer <mholzer@gentoo.org> +gkrellsun-0.12.1.ebuild:
+  Version bumped. Closes 51481
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> gkrellsun-0.9.1.ebuild:
+  Marking stable on hppa
+
+  04 Sep 2003; Aron Griffis <agriffis@gentoo.org> gkrellsun-0.9.1.ebuild:
+  stable on alpha
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellsun-0.9.1 (01 Dec 2002)
+
+  01 Dec 2002; Seemant Kulleen <seemant@gentoo.org> gkrellsun-0.9.1.ebuild
+  files/digest-gkrellsun-0.9.1 :
+
+  Version bump, which now works with gkrellmoon-0.5 for gkrellm2.  Thanks
+  to: ejwahl@cox.net (Erich Wahl) in bug #10837.
+
+*gkrellsun-0.9 (09 Nov 2002)
+
+  09 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gkrellsun-0.9.ebuild
+  files/digest-gkrellsun-0.9 :
+
+  Version bump -- works with both versions of gkrellm.
 
 *gkrellsun-0.2 (19 Feb 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index e69de29bb2d1..8c2a2fea8449 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -0,0 +1,8 @@
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 a4332778371cd7f25fc12b205d59be69 ChangeLog 1981
+MD5 4035daf38658d8f835a3c6d7907efdee gkrellsun-0.12.2.ebuild 740
+MD5 8444f07c50cf9150959f5b8a2e6522fe gkrellsun-0.9.1.ebuild 990
+MD5 b53b25f463912e87a295deea2205aa7d gkrellsun-0.12.1.ebuild 712
+MD5 6c463d4862a23490e2170516013f753b files/digest-gkrellsun-0.12.1 67
+MD5 72aa7ba3f8586925a58b6c48db102e85 files/digest-gkrellsun-0.9.1 66
+MD5 ffec2833db4cbf8e1e115b2c8bd22531 files/digest-gkrellsun-0.12.2 67
diff --git a/x11-plugins/gkrellsun/gkrellsun-0.12.1.ebuild b/x11-plugins/gkrellsun/gkrellsun-0.12.1.ebuild
index 8058b32f899e..4a6e7c8ea456 100644
--- a/x11-plugins/gkrellsun/gkrellsun-0.12.1.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-0.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/gkrellsun-0.12.1.ebuild,v 1.1 2004/07/20 17:25:54 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/gkrellsun-0.12.1.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times."
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
 
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ~sparc ~x86"
 
 DEPEND="=app-admin/gkrellm-2*
 	>=media-libs/imlib-1.9.10-r1"
diff --git a/x11-plugins/gkrellsun/gkrellsun-0.12.2.ebuild b/x11-plugins/gkrellsun/gkrellsun-0.12.2.ebuild
index aaf3916a26db..3eac13bf7f1e 100644
--- a/x11-plugins/gkrellsun/gkrellsun-0.12.2.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-0.12.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/gkrellsun-0.12.2.ebuild,v 1.1 2005/01/22 19:01:27 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/gkrellsun-0.12.2.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+inherit multilib
 
 IUSE=""
 DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times."
@@ -23,6 +25,6 @@ src_install () {
 	dodoc README AUTHORS COPYING
 
 	cd ${S}/src20
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellsun.so
 }
diff --git a/x11-plugins/gkrellsun/gkrellsun-0.9.1.ebuild b/x11-plugins/gkrellsun/gkrellsun-0.9.1.ebuild
index 40893f2aeffe..43d5a60b70c0 100644
--- a/x11-plugins/gkrellsun/gkrellsun-0.9.1.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-0.9.1.ebuild
@@ -1,47 +1,44 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/gkrellsun-0.9.1.ebuild,v 1.1 2002/12/02 07:44:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/gkrellsun-0.9.1.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times."
-SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
 HOMEPAGE="http://gkrellsun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
 
 DEPEND="app-admin/gkrellm
 	>=media-libs/imlib-1.9.10-r1"
 
 src_compile() {
-
-	if [ -f /usr/bin/gkrellm ]
+	if [ -f ${ROOT}/usr/bin/gkrellm ]
 	then
 		cd ${S}/src
 		emake || die
 	fi
 
-	if [ -f /usr/bin/gkrellm2 ]
+	if [ -f ${ROOT}/usr/bin/gkrellm2 ]
 	then
 		cd ${S}/src20
 		emake || die
 	fi
-
 }
 
 src_install () {
-
 	dodoc README AUTHORS COPYING
 
-	if [ -f /usr/bin/gkrellm ]
+	if [ -f ${ROOT}/usr/bin/gkrellm ]
 	then
 		cd ${S}/src
 		insinto /usr/lib/gkrellm/plugins
 		doins gkrellsun.so
 	fi
 
-	if [ -f /usr/bin/gkrellm2 ]
+	if [ -f ${ROOT}/usr/bin/gkrellm2 ]
 	then
 		cd ${S}/src20
 		insinto /usr/lib/gkrellm2/plugins
diff --git a/x11-plugins/gkrelltop/ChangeLog b/x11-plugins/gkrelltop/ChangeLog
index 1cc5329f6f0e..9a56ebc8c7da 100644
--- a/x11-plugins/gkrelltop/ChangeLog
+++ b/x11-plugins/gkrelltop/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for x11-plugins/gkrelltop
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/ChangeLog,v 1.1 2003/10/22 21:25:30 mholzer Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/ChangeLog,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
+
+  13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> gkrelltop-2.2.4.ebuild:
+  alpha stable
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> gkrelltop-2.2.4.ebuild:
+  Marked 2.2.4 stable on SPARC and removed executable permissions on
+  metadata.xml so that committing via repoman will work again.
+
+*gkrelltop-2.2.6 (19 May 2005)
+
+  19 May 2005; Martin Holzer <mholzer@gentoo.org> +gkrelltop-2.2.6.ebuild:
+  Version bumped.
+
+  19 May 2005; Martin Holzer <mholzer@gentoo.org> gkrelltop-2.2.4.ebuild:
+  x86 stable
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrelltop-2.2.4.ebuild:
+  multilib fixes.
+
+  25 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> gkrelltop-2.2.4.ebuild:
+  Marked stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrelltop-2.2.2.ebuild, gkrelltop-2.2.3.ebuild, gkrelltop-2.2.4.ebuild:
+  Masked gkrelltop-2.2.4.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrelltop-2.2.2.ebuild, gkrelltop-2.2.3.ebuild:
+  Masked gkrelltop-2.2.3.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkrelltop-2.2.2.ebuild:
+  Masked gkrelltop-2.2.2.ebuild stable for ppc
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrelltop-2.2.4.ebuild:
+  Marked ~amd64.
+
+*gkrelltop-2.2.4 (22 Jun 2004)
+
+  22 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrelltop-2.2.4.ebuild:
+  Version bumped. Closes 52738
+
+*gkrelltop-2.2.3 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrelltop-2.2.3.ebuild:
+  Version bumped. Closes 52226
+
+*gkrelltop-2.2.2 (26 May 2004)
+
+  26 May 2004; Martin Holzer <mholzer@gentoo.org> gkrelltop-2.2.2.ebuild,
+  metadata.xml:
+  Version bumped. Closes 51776
+
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrelltop-2.2.ebuild:
+  stable on alpha
 
 *gkrelltop-2.2 (23 Oct 2003)
 
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index 0405cb5616e0..7aa8d7cd8b9c 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,2 +1,22 @@
-MD5 5622362dd457b03496b34de23ed2a258 gkrelltop-2.2.ebuild 945
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a4d4fd2553657a78370b15d3db3eff2c gkrelltop-2.2.2.ebuild 1071
+MD5 cafded5eea504fb8e9ba892ba253e4e7 gkrelltop-2.2.ebuild 1061
+MD5 401c26388a082ddc4c4fc9bb5601fde3 gkrelltop-2.2.4.ebuild 1104
+MD5 aced8e84e9e47cdd40be95cfb3a43cb6 gkrelltop-2.2.6.ebuild 1114
+MD5 cb8a61347726fe9d2a224c1ef9b7805f gkrelltop-2.2.3.ebuild 1077
+MD5 1a1b790e0ea8144a0c0289ef3d41d09a ChangeLog 2189
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 2d223204a4a90a4db9ea4d162e7206f6 files/digest-gkrelltop-2.2.2 63
+MD5 79bb0e901dd86075b88bf0a1c7ea5536 files/digest-gkrelltop-2.2.3 63
+MD5 e35bfead92b9e281508c53dc68da0966 files/digest-gkrelltop-2.2.4 63
+MD5 8b07e14d6ea755e5d9d7b6431b1f85d2 files/digest-gkrelltop-2.2.6 66
 MD5 bc19088e1d88db5e98e5f821f27f94f3 files/digest-gkrelltop-2.2 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrc17ViELBEf1JB0RAr1uAJ45oCHgWM7qdr6ecvOQwB7Er0jiWwCeK87M
+qPxTctUUjdWcp82T3ok8KGY=
+=2Y3B
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild
index ce139639eb01..afb5d3d5b6ff 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild,v 1.1 2004/05/26 21:04:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}.${PV}.tgz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://psychology.rutgers.edu/~zaimi/software.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~x86 ~sparc ~alpha ppc"
 
 IUSE=""
 
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild
index 235c19f9bd6e..99410ff1d6a1 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild,v 1.1 2004/06/01 19:09:46 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}/${PN}.${PV}.tgz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://psychology.rutgers.edu/~zaimi/software.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~x86 ~sparc ~alpha ppc"
 
 IUSE=""
 
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild
index 2eedb7da7681..4da62bef37bb 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild,v 1.1 2004/06/22 14:06:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
+
+inherit multilib
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}/${PN}.${PV}.tgz"
@@ -8,11 +10,11 @@ HOMEPAGE="http://psychology.rutgers.edu/~zaimi/software.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 IUSE=""
 
-DEPEND="=app-admin/gkrellm-2*"
+DEPEND=">=app-admin/gkrellm-2"
 
 src_compile() {
 	# Unfortunately, the supplied Makefile won't work properly on
@@ -27,6 +29,6 @@ src_compile() {
 
 src_install() {
 	dodoc README
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrelltop2.so
 }
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild
index 043c00f57a2e..2fcc4d66dedf 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild,v 1.1 2005/05/19 13:25:00 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
 inherit multilib
 
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild
index f3c4214766a3..82173cb4d73c 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild,v 1.1 2003/10/22 21:25:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="http://psychology.rutgers.edu/~zaimi/${PN}.${PV}.tgz"
@@ -8,7 +8,9 @@ HOMEPAGE="http://psychology.rutgers.edu/~zaimi/software.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc alpha ppc"
+
+IUSE=""
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkrellweather/ChangeLog b/x11-plugins/gkrellweather/ChangeLog
index d9d5b1b9493a..68757d474b13 100644
--- a/x11-plugins/gkrellweather/ChangeLog
+++ b/x11-plugins/gkrellweather/ChangeLog
@@ -1,9 +1,72 @@
 # ChangeLog for x11-plugins/gkrellweather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.1 2002/08/30 01:49:27 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellweather-2.0.6.ebuild:
+  Stable on amd64.
+
+  27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellweather-2.0.6.ebuild:
+  multilib fixes
+
+  10 Jul 2004; Tom Martin <slarti@gentoo.org> gkrellweather-2.0.6.ebuild:
+  Marked ~amd64.
+
+  07 Feb 2004; Lars Weiler <pylon@gentoo.org> gkrellweather-2.0.6.ebuild:
+  stable on ppc
+
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellweather-2.0.6.ebuild:
+  stable on alpha
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> gkrellweather-0.2.7-r2.ebuild,
+  gkrellweather-2.0.5.ebuild, gkrellweather-2.0.6.ebuild:
+  Marked 2.0.6 stable on sparc and adjusted the copyright dates in all.
+
+  13 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  gkrellweather-2.0.6.ebuild:
+  put the GrabWeather2 script in /usr/bin, not /usr/share
+
+  03 Sep 2003; Martin Holzer <mholzer@gentoo.org> gkrellweather-2.0.6.ebuild:
+  Marking x86 stabl.e
+
+*gkrellweather-2.0.6 (18 Aug 2003)
+
+  18 Aug 2003; Martin Holzer <mholzer@gentoo.org> gkrellweather-2.0.6.ebuild:
+  Version bumped.
+
+  12 Jun 2003; <msterret@gentoo.org> gkrellweather-0.2.7-r1.ebuild,
+  gkrellweather-0.2.7-r2.ebuild, gkrellweather-2.0.3.ebuild,
+  gkrellweather-2.0.5.ebuild:
+  fix Header
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellweather-2.0.5 (01 Dec 2002)
+
+  01 Mar 2003; Brandon Low <lostlogic@gentoo.org> gkrellweather-2.0.5.ebuild:
+  Change dep on ssed to dep on >=sed-4.0.5
+
+  01 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellweather-2.0.5.ebuild files/digest-gkrellweather-2.0.5 :
+
+  Version bump.  Thanks for the notification in bug #10835 by ejwahl@cox.net
+  (Erich Wahl)
+
+*gkrellweather-2.0.3 (10 Nov 2002)
+
+  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> gkrellweather-2.0.3.ebuild:
+  Change supersed dependencies
+
+  10 Nov 2002; Seemant Kulleen <seemant@gentoo.org>
+  gkrellweather-2.0.3.ebuild files/digest-gkrellweather-2.0.3 :
+
+  GKrellM2 version. Submitted by: absinthe@pobox.com (Dylan Carlson) in bug
+  #10530
 
 *gkrellweather-0.2.7-r2 (30 May 2002)
 
+  11 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index a59574698a9b..eef61852dacc 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,9 +1,16 @@
-MD5 51755887d41ee904ae5d2fa53116c3dc gkrellweather-0.2.7-r2.ebuild 1007
-MD5 5242441592a69e4f0438ff68ef786785 gkrellweather-2.0.3.ebuild 1000
-MD5 7aa99a45f0f6a5c45bd19c9c6a95ec7c gkrellweather-2.0.5.ebuild 1003
-MD5 2c768ff580cc6114694227098279b66c gkrellweather-0.2.7-r1.ebuild 826
-MD5 fcca253738f7b4a8b08f6c2d923054c3 ChangeLog 2246
-MD5 b718cc1d7a4323ff08f51e1a1b11ea81 files/digest-gkrellweather-0.2.7-r1 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e38379346d149459c341c58e182267c9 gkrellweather-0.2.7-r2.ebuild 997
+MD5 c122ae90cf207078b9b6e73ca6ea18f7 ChangeLog 3462
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 4487ed3cece27562fd5da7e7ac069f3a gkrellweather-2.0.6.ebuild 1030
 MD5 7a8cb4e990a4380049aeb67f5a05f5f4 files/digest-gkrellweather-0.2.7-r2 142
-MD5 bcf85d60cc93d532fd0e4290e8ce854a files/digest-gkrellweather-2.0.3 67
-MD5 32b8d60e331857d4c929e1b82d4d241e files/digest-gkrellweather-2.0.5 67
+MD5 d31faae71487ebf3fcf81bf89cb7861f files/digest-gkrellweather-2.0.6 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb8Ol2G5bA0cA/ScRAhyqAJ4+cBCmGRDz225YTwEgObwvujnkvgCgnI3Q
+hl/ySsgdUKjiBekpLB2XOgM=
+=l2je
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild
index 97fdaa64c500..c2ddb16b03d8 100644
--- a/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-0.2.7-r2.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
-# 26 Apr 2001 21:30 CST blutgens Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 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"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ppc sparc"
 
-DEPEND=">=app-admin/gkrellm-1.2.9
+DEPEND="=app-admin/gkrellm-1.2*
 	>=net-misc/wget-1.5.3"
 
 RDEPEND="${DEPEND}
-	>=sys-devel/perl-5.6.1"
+	>=dev-lang/perl-5.6.1"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -27,17 +26,14 @@ src_unpack() {
 }
 
 src_compile() {
-
-    emake || die
-
+	emake || die
 }
 
 src_install () {
-
 	exeinto /usr/share/gkrellm
-    doexe GrabWeather 
+	doexe GrabWeather
 
-    insinto /usr/lib/gkrellm/plugins
-    doins gkrellweather.so
-    dodoc README ChangeLog COPYING
+	insinto /usr/lib/gkrellm/plugins
+	doins gkrellweather.so
+	dodoc README ChangeLog COPYING
 }
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.6.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.6.ebuild
index 8182f0a43634..6797d5dcbb96 100644
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.6.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.6.ebuild,v 1.1 2003/08/18 19:03:10 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit multilib
+
+IUSE=""
 DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
 info"
 SRC_URI="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/${P}.tgz"
@@ -10,7 +12,7 @@ HOMEPAGE="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 DEPEND="=app-admin/gkrellm-2*
 	>=sys-apps/sed-4.0.5
@@ -24,20 +26,20 @@ src_unpack() {
 	cd ${S}
 
 	sed -i \
-		-e "s:/usr/local/bin:/usr/share/gkrellm:g" \
 		-e "s:GrabWeather:GrabWeather2:g" \
+		-e "s:/usr/share/gkrellm:/usr/bin:g" \
 		gkrellweather.c
 }
 
 src_compile() {
-	emake || die
+	emake PREFIX=/usr || die
 }
 
 src_install () {
-	exeinto /usr/share/gkrellm
+	exeinto /usr/bin
 	newexe GrabWeather GrabWeather2
 
-	insinto /usr/lib/gkrellm2/plugins
+	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	doins gkrellweather.so
 	dodoc README ChangeLog COPYING
 }
diff --git a/x11-plugins/gkwebmon/ChangeLog b/x11-plugins/gkwebmon/ChangeLog
index 94b02c207825..91898b1b3536 100644
--- a/x11-plugins/gkwebmon/ChangeLog
+++ b/x11-plugins/gkwebmon/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-plugins/gkwebmon
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkwebmon/ChangeLog,v 1.1 2003/02/12 11:03:19 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkwebmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gkwebmon-0.2.ebuild:
+  Mark 0.2 stable on alpha
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gkwebmon-0.2.ebuild:
+  Masked gkwebmon-0.2.ebuild stable for ppc
+
+  19 Jun 2004; <pyrania@gentoo.org> gkwebmon-0.2.ebuild:
+  Stable on x86.
+
+  12 May 2004; Daniel Ahlberg <aliz@gentoo.org> gkwebmon-0.2.ebuild:
+  Removed S=.
+
+*gkwebmon-0.2 (25 Mar 2004)
+
+  25 Mar 2004; Markus Nigbur <pyrania@gentoo.org> gkwebmon-0.2.ebuild:
+  Version bump. Closing bug #38336.
 
 *gkwebmon-0.1b (12 Feb 2003)
 
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index e69de29bb2d1..4821f7da522d 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -0,0 +1,5 @@
+MD5 678bb7aa8a6935b51efda602b84f5506 gkwebmon-0.2.ebuild 569
+MD5 6b2a2d910099cdbb2d26b0577937c10c gkwebmon-0.1b.ebuild 575
+MD5 25ba8c47756736040f01af79bfd51b47 ChangeLog 1034
+MD5 e2d0f770ed50ef17fbeac6997d779f20 files/digest-gkwebmon-0.1b 64
+MD5 e3e58b3fad106069c8f4278c0ca12874 files/digest-gkwebmon-0.2 60
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.1b.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.1b.ebuild
index fd36e211404b..5eacf81e40ff 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.1b.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.1b.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkwebmon/gkwebmon-0.1b.ebuild,v 1.1 2003/02/12 11:03:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkwebmon/gkwebmon-0.1b.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A web monitor plugin for GKrellM2"
 HOMEPAGE="http://gkwebmon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkwebmon/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc ~sparc ~alpha"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2.ebuild
index 1b0b62706af1..d91b01e0a982 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkwebmon/gkwebmon-0.2.ebuild,v 1.1 2004/03/25 02:47:55 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkwebmon/gkwebmon-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A web monitor plugin for GKrellM2"
 HOMEPAGE="http://gkwebmon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkwebmon/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="alpha ppc ~sparc x86"
 
 DEPEND="=app-admin/gkrellm-2*"
 
diff --git a/x11-plugins/guifications/ChangeLog b/x11-plugins/guifications/ChangeLog
index 791ad07d462d..68d78433b536 100644
--- a/x11-plugins/guifications/ChangeLog
+++ b/x11-plugins/guifications/ChangeLog
@@ -1,6 +1,132 @@
-# ChangeLog for net-im/guifications
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/ChangeLog,v 1.1 2004/07/08 15:21:54 rizzo Exp $
+# ChangeLog for x11-plugins/guifications
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+*guifications-2.12 (03 Aug 2005)
+
+  03 Aug 2005; Don Seiler <rizzo@gentoo.org> +guifications-2.12.ebuild:
+  Version bump
+
+  28 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  guifications-2.10.ebuild:
+  Stable on sparc
+
+  28 Jul 2005; Don Seiler <rizzo@gentoo.org> -guifications-2.9.ebuild,
+  guifications-2.10.ebuild:
+  2.10 stable x86
+
+*guifications-2.10 (10 Apr 2005)
+
+  10 Apr 2005; Don Seiler <rizzo@gentoo.org> +guifications-2.10.ebuild:
+  Version bump
+
+*guifications-2.9 (11 Feb 2005)
+
+  11 Feb 2005; Don Seiler <rizzo@gentoo.org> +guifications-2.9.ebuild:
+  Version bump
+
+  07 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> guifications-2.8.ebuild:
+  Stable on sparc
+
+  27 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> guifications-2.6.ebuild:
+  Stable on sparc
+
+*guifications-2.8 (08 Jan 2005)
+
+  08 Jan 2005; Don Seiler <rizzo@gentoo.org> +guifications-2.8.ebuild:
+  Version bump
+
+*guifications-2.7 (07 Jan 2005)
+
+  07 Jan 2005; Don Seiler <rizzo@gentoo.org> +guifications-2.7.ebuild:
+  Version bump
+
+*guifications-2.6 (17 Dec 2004)
+
+  17 Dec 2004; Don Seiler <rizzo@gentoo.org> +guifications-2.6.ebuild:
+  Version bump
+
+*guifications-2.5 (24 Nov 2004)
+
+  24 Nov 2004; Don Seiler <rizzo@gentoo.org> +guifications-2.5.ebuild:
+  Version bump
+
+  25 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> guifications-2.4.ebuild:
+  Stable on sparc
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -guifications-2.0.ebuild,
+  -guifications-2.1.ebuild, -guifications-2.2.ebuild,
+  -guifications-2.3.ebuild, guifications-2.4.ebuild:
+  Stable on x86, pruning old versions
+
+*guifications-2.4 (16 Oct 2004)
+
+  16 Oct 2004; Don Seiler <rizzo@gentoo.org> +guifications-2.4.ebuild:
+  Versino bump, closes bug #67755
+
+*guifications-2.3 (08 Oct 2004)
+
+  08 Oct 2004; Don Seiler <rizzo@gentoo.org> +guifications-2.3.ebuild:
+  Version bump
+
+  04 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> guifications-2.2.ebuild:
+  Stable on sparc to cover gaim 1.0.0
+
+*guifications-2.2 (18 Sep 2004)
+
+  18 Sep 2004; Don Seiler <rizzo@gentoo.org> +guifications-2.2.ebuild:
+  Version bump
+
+  15 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> guifications-2.1.ebuild:
+  Stable on sparc
+
+  03 Sep 2004; Don Seiler <rizzo@gentoo.org> guifications-2.1.ebuild:
+  Stable on x86
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  guifications-2.0.ebuild, guifications-2.1.ebuild:
+  Masked guifications-2.1.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  guifications-2.0.ebuild:
+  Masked guifications-2.0.ebuild stable for ppc
+
+  30 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> guifications-2.1.ebuild:
+  Keyworded ~sparc in preparation for the future
+
+  30 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> guifications-2.0.ebuild:
+  Keyworded ~sparc wrt #61980
+
+*guifications-2.1 (26 Aug 2004)
+
+  26 Aug 2004; Don Seiler <rizzo@gentoo.org> -guifications-1.10-r1.ebuild,
+  -guifications-1.10.ebuild, +guifications-2.1.ebuild:
+  New version
+
+  18 Aug 2004; Don Seiler <rizzo@gentoo.org> guifications-2.0.ebuild:
+  Stable on x86, fixes Bug #60748.
+
+*guifications-2.0 (17 Aug 2004)
+
+  17 Aug 2004; Don Seiler <rizzo@gentoo.org> +guifications-2.0.ebuild:
+  Version bump
+
+  15 Aug 2004; Jason Wever <weeve@gentoo.org> guifications-1.10-r1.ebuild:
+  Added ~sparc keyword, resolves bug #59946.
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> guifications-1.10.ebuild:
+  Stable on x86, only works for 0.80
+
+*guifications-1.10-r1 (06 Aug 2004)
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> +files/gf-1.10-gaim-0.81.patch,
+  +guifications-1.10-r1.ebuild:
+  Patch from Stu Tomlinson for gaim-0.81
+
+*guifications-1.10 (19 Jul 2004)
+
+  19 Jul 2004; Don Seiler <rizzo@gentoo.org> +guifications-1.10.ebuild:
+  Version bump
 
   08 Jul 2004; Don Seiler <rizzo@gentoo.org> +guifications-1.7.ebuild,
   +guifications-1.9.ebuild:
diff --git a/x11-plugins/guifications/Manifest b/x11-plugins/guifications/Manifest
index f9aa2de741d2..0500c11531c8 100644
--- a/x11-plugins/guifications/Manifest
+++ b/x11-plugins/guifications/Manifest
@@ -1,4 +1,8 @@
-MD5 7d67bb6b7d18c7c3ddf39974bad8a169 guifications-1.7.ebuild 862
-MD5 5acf7db0553b89fb2bf65bf042165e98 guifications-1.9.ebuild 788
-MD5 5e270d00dd63070c0c9d315bfa024760 files/digest-guifications-1.7 68
-MD5 c1aabfc817561e21e0a9871755effaf2 files/digest-guifications-1.9 68
+MD5 fb88f1c452ac7d0b77e43f803adbc71c ChangeLog 5143
+MD5 83ddff6fa7da303fb3ccb30f794e4164 guifications-2.12.ebuild 836
+MD5 4b0340b0b3f10a3a2315e6628ddcd595 guifications-2.10.ebuild 837
+MD5 de00a008d8fa442c5dbb0b7003268702 metadata.xml 289
+MD5 fa2790ed399bfce44981c6acabafddc3 guifications-2.8.ebuild 836
+MD5 b306095b9ea532481775501a4dc06428 files/digest-guifications-2.12 70
+MD5 9a0cf37e06bdff12bef1576f76ad8220 files/digest-guifications-2.10 70
+MD5 bce0aae492d550fb0e1763ac9a05e046 files/digest-guifications-2.8 69
diff --git a/x11-plugins/guifications/guifications-2.10.ebuild b/x11-plugins/guifications/guifications-2.10.ebuild
index e83bc871f4fa..98c73b6d8c44 100644
--- a/x11-plugins/guifications/guifications-2.10.ebuild
+++ b/x11-plugins/guifications/guifications-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/guifications-2.10.ebuild,v 1.1 2005/04/10 23:22:11 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/guifications-2.10.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 DESCRIPTION="Guifications are graphical notification plugin for the open source instant message client gaim"
 HOMEPAGE="http://guifications.sourceforge.net"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 ~amd64 ~ppc sparc"
 IUSE="debug"
 
 DEPEND=">=net-im/gaim-1.0.0"
diff --git a/x11-plugins/guifications/guifications-2.12.ebuild b/x11-plugins/guifications/guifications-2.12.ebuild
index 86f2717a8edc..eb40b262378a 100644
--- a/x11-plugins/guifications/guifications-2.12.ebuild
+++ b/x11-plugins/guifications/guifications-2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/guifications-2.12.ebuild,v 1.1 2005/08/03 03:29:12 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/guifications-2.12.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 DESCRIPTION="Guifications are graphical notification plugin for the open source instant message client gaim"
 HOMEPAGE="http://guifications.sourceforge.net"
diff --git a/x11-plugins/guifications/guifications-2.8.ebuild b/x11-plugins/guifications/guifications-2.8.ebuild
index 6f4b30420620..b6652f6ddbb0 100644
--- a/x11-plugins/guifications/guifications-2.8.ebuild
+++ b/x11-plugins/guifications/guifications-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/guifications-2.8.ebuild,v 1.1 2005/01/09 05:13:35 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/guifications-2.8.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 DESCRIPTION="Guifications are graphical notification plugin for the open source instant message client gaim"
 HOMEPAGE="http://guifications.sourceforge.net"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 ~amd64 ~ppc sparc"
 IUSE="debug"
 
 DEPEND=">=net-im/gaim-1.0.0"
diff --git a/x11-plugins/guifications/metadata.xml b/x11-plugins/guifications/metadata.xml
index 5c6f73ea17af..bc3d909c4b35 100644
--- a/x11-plugins/guifications/metadata.xml
+++ b/x11-plugins/guifications/metadata.xml
@@ -2,8 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-  <email>gaim-bugs@gentoo.org</email>
-</maintainer>
 <longdescription>Guifications are graphical notification plugin for the open source instant message client gaim</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/i8krellm/ChangeLog b/x11-plugins/i8krellm/ChangeLog
index b84b8ca6bf4a..502a2940ef42 100644
--- a/x11-plugins/i8krellm/ChangeLog
+++ b/x11-plugins/i8krellm/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-plugins/i8krellm
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/ChangeLog,v 1.1 2003/02/12 10:56:18 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  08 Mar 2004; Peter Johanson <latexer@gentoo.org> i8krellm-2.3.ebuild,
+  i8krellm-2.5.ebuild:
+  i8kutils moved to app-laptop
+
+*i8krellm-2.5 (02 Oct 2003)
+
+  02 Oct 2003; Heinrich Wendel <lanius@gentoo.org> i8krellm-2.5.ebuild:
+  version bump
+
+*i8krellm-2.3 (13 Feb 2003)
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> i8krellm-2.2.ebuild,
+  i8krellm-2.3.ebuild:
+  Automated cleanup of LICENSE
+
+  13 Feb 2003; Seemant Kulleen <seemant@gentoo.org> i8krellm-2.3.ebuild files/digest-i8krellm-2.3 :
+  version bump thanks to Christoph Hornung <hornung@cs.tu-berlin.de> in bug #15627
 
 *i8krellm-2.2 (12 Feb 2003)
 
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index e69de29bb2d1..bc304b0f8e4f 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -0,0 +1,6 @@
+MD5 5f913ba0b114ee7dbf43ab67df2c6466 i8krellm-2.3.ebuild 992
+MD5 735a09e87b0a9d8bf23afdd3777e4995 i8krellm-2.5.ebuild 1222
+MD5 5b35976a27cb4fc568eb9d207becc753 ChangeLog 1132
+MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
+MD5 d3fcf98bdcd86e56476425aa160f8574 files/digest-i8krellm-2.3 63
+MD5 7aa6185d1690363a1789d64f1a5c9fb5 files/digest-i8krellm-2.5 63
diff --git a/x11-plugins/i8krellm/i8krellm-2.3.ebuild b/x11-plugins/i8krellm/i8krellm-2.3.ebuild
index 74cb98ed3d7e..c7eafcaea7ab 100644
--- a/x11-plugins/i8krellm/i8krellm-2.3.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.3.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/i8krellm-2.3.ebuild,v 1.1 2003/02/13 13:54:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/i8krellm-2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 IUSE="gtk2"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
 SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
 HOMEPAGE="http://www.coding-zone.com/i8krellm.phtml"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
 
 DEPEND="app-admin/gkrellm
 	x11-libs/gtk+
 	gtk2? ( =x11-libs/gtk+-2*
 		=app-admin/gkrellm-2* )
-	>=sys-apps/i8kutils-1.5"
+	>=app-laptop/i8kutils-1.5"
 
 src_compile() {
-	
+
 	if [ -f /usr/bin/gkrellm ]
 	then
 		emake || die
diff --git a/x11-plugins/i8krellm/i8krellm-2.5.ebuild b/x11-plugins/i8krellm/i8krellm-2.5.ebuild
index 807d42209eb9..8c3a8a71d686 100644
--- a/x11-plugins/i8krellm/i8krellm-2.5.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.5.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/i8krellm-2.5.ebuild,v 1.1 2003/10/02 14:09:55 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/i8krellm-2.5.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 IUSE="gtk2"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
 SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
 HOMEPAGE="http://www.coding-zone.com/i8krellm.phtml"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
 
 DEPEND="app-admin/gkrellm
 	x11-libs/gtk+
 	gtk2? ( =x11-libs/gtk+-2*
 		=app-admin/gkrellm-2* )
-	>=sys-apps/i8kutils-1.5"
+	>=app-laptop/i8kutils-1.5"
 
 src_compile() {
 
diff --git a/x11-plugins/i8krellm/metadata.xml b/x11-plugins/i8krellm/metadata.xml
index 0a46330e1c3d..73420b6cf0f0 100644
--- a/x11-plugins/i8krellm/metadata.xml
+++ b/x11-plugins/i8krellm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mobile</herd>
+<herd>no-herd</herd>
 <maintainer>
   <email>maintainer-needed@gentoo.org</email>
 </maintainer>
diff --git a/x11-plugins/ignorance/ChangeLog b/x11-plugins/ignorance/ChangeLog
index 6b31b2c86d7a..d9cf23eef697 100644
--- a/x11-plugins/ignorance/ChangeLog
+++ b/x11-plugins/ignorance/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for x11-plugins/ignorance
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ignorance/ChangeLog,v 1.1 2005/04/03 21:14:07 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ignorance/ChangeLog,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
+
+*ignorance-2.3 (08 Nov 2005)
+
+  08 Nov 2005; <gothgirl@gentoo.org> +ignorance-2.3.ebuild:
+  version bump
+
+  17 Oct 2005; <gothgirl@gentoo.org> -ignorance-1.3.0.ebuild,
+  -ignorance-1.3.1.2.ebuild, -ignorance-1.3.1.3.ebuild,
+  ignorance-2.0.ebuild:
+  Updated Homepage and SRC_URI
+
+*ignorance-2.0 (17 Aug 2005)
+
+  17 Aug 2005; <gothgirl@gentoo.org> +ignorance-2.0.ebuild:
+  Version Bump
+
+*ignorance-1.3.1.3 (13 Aug 2005)
+
+  13 Aug 2005; <gothgirl@gentoo.org> +ignorance-1.3.1.3.ebuild:
+  Revision bump
+
+*ignorance-1.3.1.2 (13 Jul 2005)
+
+  13 Jul 2005; <gothgirl@gentoo.org> metadata.xml,
+  -ignorance-1.1.3_beta1.ebuild, -ignorance-1.3.1.1.ebuild,
+  +ignorance-1.3.1.2.ebuild:
+  Revision bump, new maintainer
+
+*ignorance-1.3.1.1 (21 Jun 2005)
+
+  21 Jun 2005; Jory A. Pratt <anarchy@gentoo.org> +ignorance-1.3.1.1.ebuild:
+  revision bump
+
+*ignorance-1.3.0 (21 Apr 2005)
+
+  21 Apr 2005; Jory A. Pratt <anarchy@gentoo.org> +ignorance-1.3.0.ebuild:
+  new upstream
 
 *ignorance-1.1.3_beta1 (03 Apr 2005)
 
diff --git a/x11-plugins/ignorance/Manifest b/x11-plugins/ignorance/Manifest
index 82672d25e673..ad4f3cc28a43 100644
--- a/x11-plugins/ignorance/Manifest
+++ b/x11-plugins/ignorance/Manifest
@@ -1,4 +1,6 @@
-MD5 fb159cb105ea3aa8a87d6caf37254f87 ignorance-1.1.3_beta1.ebuild 518
-MD5 c74e6205b845c14b408e323023958fa2 metadata.xml 337
-MD5 08df11ae2da54397d5760bf77848c9e0 ChangeLog 332
-MD5 a67d2591d38ea65d774409b72d7cbeea files/digest-ignorance-1.1.3_beta1 73
+MD5 d2ad1962a15f93045f60e155ca956ac9 ChangeLog 1386
+MD5 81c72ec6f81e47c93cc33969dfb0b8f5 files/digest-ignorance-2.0 66
+MD5 d413c075b955943cd5d23d853ab98810 files/digest-ignorance-2.3 66
+MD5 b9126c9e6eaafcf3e01a5b027a671b1b ignorance-2.0.ebuild 739
+MD5 b9bc4ace26a6c1b2434e2ca72e8fd6bc ignorance-2.3.ebuild 739
+MD5 003482320f46f06d6cb0c5e55681fefc metadata.xml 336
diff --git a/x11-plugins/ignorance/ignorance-2.0.ebuild b/x11-plugins/ignorance/ignorance-2.0.ebuild
index ca68e3b71bdb..cd2cb713433c 100644
--- a/x11-plugins/ignorance/ignorance-2.0.ebuild
+++ b/x11-plugins/ignorance/ignorance-2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ignorance/ignorance-2.0.ebuild,v 1.1 2005/08/17 16:53:26 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ignorance/ignorance-2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="GAIM Advanced Ignore filter"
-HOMEPAGE="http://bard.sytes.net/ignorance/"
-SRC_URI="http://bard.sytes.net/ignorance/${P}.tar.bz2"
+HOMEPAGE="http://ignorance.sf.net"
+SRC_URI="mirror://sourceforge/ignorance/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/ignorance/ignorance-2.3.ebuild b/x11-plugins/ignorance/ignorance-2.3.ebuild
index ff6f105b877e..a1998a92c3ad 100644
--- a/x11-plugins/ignorance/ignorance-2.3.ebuild
+++ b/x11-plugins/ignorance/ignorance-2.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ignorance/ignorance-2.3.ebuild,v 1.1 2005/11/07 23:35:37 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ignorance/ignorance-2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="GAIM Advanced Ignore filter"
 HOMEPAGE="http://ignorance.sf.net"
-SRC_URI="mirror:sourceforge/ignorance/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/ignorance/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/ignorance/metadata.xml b/x11-plugins/ignorance/metadata.xml
index 50911640c3af..ffc24609601d 100644
--- a/x11-plugins/ignorance/metadata.xml
+++ b/x11-plugins/ignorance/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>net-im</herd>
 <maintainer>
-    <email>gaim-bugs@gentoo.org</email>
+    <email>gothgirl@gentoo.org</email>
 </maintainer>
 <longdescription>
 Advanced message filter for gaim, Allows you to specify what is filtered.
diff --git a/x11-plugins/karamba-agenda/ChangeLog b/x11-plugins/karamba-agenda/ChangeLog
index 63a494fd3774..755fa548bbc9 100644
--- a/x11-plugins/karamba-agenda/ChangeLog
+++ b/x11-plugins/karamba-agenda/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/karamba-agenda
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-agenda/ChangeLog,v 1.1 2003/05/04 01:58:58 prez Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-agenda/ChangeLog,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-agenda-0.1.ebuild:
+  Added to ~ppc.
 
 *karamba-agenda-0.1 (03 May 2003)
 
diff --git a/x11-plugins/karamba-agenda/Manifest b/x11-plugins/karamba-agenda/Manifest
index e69de29bb2d1..f567d9fc8808 100644
--- a/x11-plugins/karamba-agenda/Manifest
+++ b/x11-plugins/karamba-agenda/Manifest
@@ -0,0 +1,3 @@
+MD5 5ac6a2871e41c2a0d1ed79a05d3c1c0e karamba-agenda-0.1.ebuild 1180
+MD5 d2bc8c0cd6e4126aba168d08571ffa50 ChangeLog 448
+MD5 dd5b5e51204df1452c0afbf2aff593e1 files/digest-karamba-agenda-0.1 62
diff --git a/x11-plugins/karamba-agenda/karamba-agenda-0.1.ebuild b/x11-plugins/karamba-agenda/karamba-agenda-0.1.ebuild
index 4869add6783f..a7d141776d6f 100644
--- a/x11-plugins/karamba-agenda/karamba-agenda-0.1.ebuild
+++ b/x11-plugins/karamba-agenda/karamba-agenda-0.1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-agenda/karamba-agenda-0.1.ebuild,v 1.1 2003/05/04 01:58:58 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-agenda/karamba-agenda-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Current Agenda plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5793"
 SRC_URI="http://www.kdelook.org/content/files/5793-agenda.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
-RDEPEND="|| (x11-misc/karamba-0.17 x11-misc/superkaramba-0.21)"
+RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
 src_unpack () {
 	unpack ${A}
@@ -22,8 +23,8 @@ src_compile () {
 
 src_install () {
 	dodir /usr/share/karamba/bin /usr/share/karamba/themes
-	sed -e 's#/home/petros/.kde/share/apps/karamba/agenda/agenda.txt#$HOME/agenda.txt#' agenda.sh \
-		> ${D}/usr/share/karamba/bin/agenda.sh
+	sed -e 's#/home/petros/.kde/share/apps/karamba/agenda/agenda.txt#$HOME/.karamba/agenda.txt#' \
+		agenda.sh > ${D}/usr/share/karamba/bin/agenda.sh
 	chmod 755 ${D}/usr/share/karamba/bin/agenda.sh
 
 	dodir /usr/share/karamba/themes/agenda
diff --git a/x11-plugins/karamba-albums/ChangeLog b/x11-plugins/karamba-albums/ChangeLog
index 7441ea82cd90..760cb3725b1f 100644
--- a/x11-plugins/karamba-albums/ChangeLog
+++ b/x11-plugins/karamba-albums/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/karamba-albums
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-albums/ChangeLog,v 1.1 2003/05/04 05:16:27 prez Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-albums/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-albums-1.5a.ebuild:
+  Added to ~ppc.
 
 *karamba-albums-1.5a (03 May 2003)
 
diff --git a/x11-plugins/karamba-albums/Manifest b/x11-plugins/karamba-albums/Manifest
index e69de29bb2d1..9de47ddb136c 100644
--- a/x11-plugins/karamba-albums/Manifest
+++ b/x11-plugins/karamba-albums/Manifest
@@ -0,0 +1,3 @@
+MD5 5b10b3e384cc15b6871bb5f2b547696c karamba-albums-1.5a.ebuild 1480
+MD5 4f60047c49de43eca7ba447b1212e72f ChangeLog 451
+MD5 70a74409b1bf325adbf2845c4165a256 files/digest-karamba-albums-1.5a 63
diff --git a/x11-plugins/karamba-albums/karamba-albums-1.5a.ebuild b/x11-plugins/karamba-albums/karamba-albums-1.5a.ebuild
index b13bc2010e41..cde5f4252e40 100644
--- a/x11-plugins/karamba-albums/karamba-albums-1.5a.ebuild
+++ b/x11-plugins/karamba-albums/karamba-albums-1.5a.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-albums/karamba-albums-1.5a.ebuild,v 1.1 2003/05/04 05:16:27 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-albums/karamba-albums-1.5a.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
-DESCRIPTION="BOFH bar plugin for Karamba"
+IUSE=""
+DESCRIPTION="Image albums plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5692"
 SRC_URI="http://www.kdelook.org/content/files/5692-albums_${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
diff --git a/x11-plugins/karamba-bluebar_kroller/ChangeLog b/x11-plugins/karamba-bluebar_kroller/ChangeLog
index 16386cc6a1a1..4ae77ff454a2 100644
--- a/x11-plugins/karamba-bluebar_kroller/ChangeLog
+++ b/x11-plugins/karamba-bluebar_kroller/ChangeLog
@@ -1,8 +1,13 @@
-# 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.1 2003/05/04 09:37:05 prez Exp $
+# ChangeLog for x11-plugins/karamba-bluebar_kroller
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bluebar_kroller/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-*karamba-bluebar-kroller-0.84 (03 May 2003)
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org>
+  karamba-bluebar_kroller-0.84.ebuild:
+  SRC_URI changed - Now hosting the tarball on gentoo servers (spaces in
+  filename workaround)
+
+*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 e69de29bb2d1..37882567a16a 100644
--- a/x11-plugins/karamba-bluebar_kroller/Manifest
+++ b/x11-plugins/karamba-bluebar_kroller/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 407c7cc3ae708adf0ce10b14a11247af karamba-bluebar_kroller-0.84.ebuild 1496
+MD5 a38619a937d12c459f4ae4194a764ff4 ChangeLog 574
+MD5 bb418719a7e523c094a92b405bc33b40 files/digest-karamba-bluebar_kroller-0.84 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBMLfkT+MN7JbqCpMRAqbSAJ43b1B1T49MWYJkyovDrga9QIcdVgCeI2tk
+s7225pzPmaKgVx6AaPP3tXk=
+=3QPG
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/karamba-bluebar_kroller/files/digest-karamba-bluebar_kroller-0.84 b/x11-plugins/karamba-bluebar_kroller/files/digest-karamba-bluebar_kroller-0.84
index 6e3270d1b2fe..5c09bba9d7d2 100644
--- a/x11-plugins/karamba-bluebar_kroller/files/digest-karamba-bluebar_kroller-0.84
+++ b/x11-plugins/karamba-bluebar_kroller/files/digest-karamba-bluebar_kroller-0.84
@@ -1 +1 @@
-MD5 a792e5a7903a36e0d0d92d22afaa5e41 5972-bluebar%20kroller.tar.gz 365403
+MD5 590c38a2b824bbe0bf630f4477226eba 5972-bluebar_mixed_kroller.tar.gz 373253
diff --git a/x11-plugins/karamba-bluebar_kroller/karamba-bluebar_kroller-0.84.ebuild b/x11-plugins/karamba-bluebar_kroller/karamba-bluebar_kroller-0.84.ebuild
index 5e4828d2a589..aef4c44a4f21 100644
--- a/x11-plugins/karamba-bluebar_kroller/karamba-bluebar_kroller-0.84.ebuild
+++ b/x11-plugins/karamba-bluebar_kroller/karamba-bluebar_kroller-0.84.ebuild
@@ -1,13 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bluebar_kroller/karamba-bluebar_kroller-0.84.ebuild,v 1.1 2003/05/04 09:37:05 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bluebar_kroller/karamba-bluebar_kroller-0.84.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Kroller and Bluebar plugins together for Karamba"
-HOMEPAGE="http://www.kdelook.org/content/show.php?content=5972"
-SRC_URI="http://www.kdelook.org/content/files/5972-bluebar%20kroller.tar.gz"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=5972"
+# SRC_URI="http://www.kde-look.org/content/files/5972-bluebar%20mixed%20kroller.tar.gz"
+SRC_URI="http://dev.gentoo.org/~eldad/distfiles/5972-bluebar_mixed_kroller.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND=">=x11-misc/superkaramba-0.21
 	media-plugins/xmms-find
diff --git a/x11-plugins/karamba-bofh_bar/ChangeLog b/x11-plugins/karamba-bofh_bar/ChangeLog
index 415db8db1845..166d67c36258 100644
--- a/x11-plugins/karamba-bofh_bar/ChangeLog
+++ b/x11-plugins/karamba-bofh_bar/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for x11-plugins/karamba-kroller
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bofh_bar/ChangeLog,v 1.1 2003/05/04 03:12:52 prez Exp $
+# ChangeLog for x11-plugins/karamba-bofh_bar
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bofh_bar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+*karamba-bofh_bar-0.01 (29 Oct 2003)
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-bofh_bar-0.01.ebuild:
+  Added to ~ppc.
 
 *karamba-kroller-0.84 (03 May 2003)
 
diff --git a/x11-plugins/karamba-bofh_bar/Manifest b/x11-plugins/karamba-bofh_bar/Manifest
index e69de29bb2d1..010149d188aa 100644
--- a/x11-plugins/karamba-bofh_bar/Manifest
+++ b/x11-plugins/karamba-bofh_bar/Manifest
@@ -0,0 +1,3 @@
+MD5 36895ce3abba9e6970ed665a7aec35d5 karamba-bofh_bar-0.01.ebuild 1335
+MD5 b0a98f20c7f77c288da7bc9596144447 ChangeLog 497
+MD5 1858c001a52df3a117a0b6ca4ae3f23c files/digest-karamba-bofh_bar-0.01 65
diff --git a/x11-plugins/karamba-bofh_bar/karamba-bofh_bar-0.01.ebuild b/x11-plugins/karamba-bofh_bar/karamba-bofh_bar-0.01.ebuild
index 66f0a6e11012..5e8d8b81678a 100644
--- a/x11-plugins/karamba-bofh_bar/karamba-bofh_bar-0.01.ebuild
+++ b/x11-plugins/karamba-bofh_bar/karamba-bofh_bar-0.01.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bofh_bar/karamba-bofh_bar-0.01.ebuild,v 1.1 2003/05/04 03:12:52 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-bofh_bar/karamba-bofh_bar-0.01.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="BOFH bar plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5892"
 SRC_URI="http://www.kdelook.org/content/files/5892-bofh_bar.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
-RDEPEND="|| (>=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21)"
+RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
 src_unpack () {
 	unpack ${A}
diff --git a/x11-plugins/karamba-disk/ChangeLog b/x11-plugins/karamba-disk/ChangeLog
index 699d88e502a6..e2680389d9b6 100644
--- a/x11-plugins/karamba-disk/ChangeLog
+++ b/x11-plugins/karamba-disk/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for x11-plugins/karamba-weather
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-disk/ChangeLog,v 1.1 2003/05/04 05:51:29 prez Exp $
+# ChangeLog for x11-plugins/karamba-disk
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-disk/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-disk-0.17.ebuild:
+  Added to ~ppc.
 
 *karamba-disk-0.17 (03 May 2003)
 
diff --git a/x11-plugins/karamba-disk/Manifest b/x11-plugins/karamba-disk/Manifest
index e69de29bb2d1..5ca07f9142e4 100644
--- a/x11-plugins/karamba-disk/Manifest
+++ b/x11-plugins/karamba-disk/Manifest
@@ -0,0 +1,3 @@
+MD5 be78fb770f3e5ca757fd69aabb157305 karamba-disk-0.17.ebuild 761
+MD5 b032a73c835d51fed2220e1fb5969bf1 ChangeLog 441
+MD5 754bb06d171a4e0b6b297753694154c2 files/digest-karamba-disk-0.17 62
diff --git a/x11-plugins/karamba-disk/karamba-disk-0.17.ebuild b/x11-plugins/karamba-disk/karamba-disk-0.17.ebuild
index 0c349837fa96..cf2f0a3f5066 100644
--- a/x11-plugins/karamba-disk/karamba-disk-0.17.ebuild
+++ b/x11-plugins/karamba-disk/karamba-disk-0.17.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-disk/karamba-disk-0.17.ebuild,v 1.1 2003/05/04 05:51:29 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-disk/karamba-disk-0.17.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-DESCRIPTION="Samba status plugin for Karamba"
+IUSE=""
+DESCRIPTION="Disk Usage plugin for Karamba"
 HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/"
 SRC_URI="http://www.efd.lth.se/~d98hk/karamba/karamba_disk.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
diff --git a/x11-plugins/karamba-docker/ChangeLog b/x11-plugins/karamba-docker/ChangeLog
index 90d9f709e6ee..f3b9045cc2f8 100644
--- a/x11-plugins/karamba-docker/ChangeLog
+++ b/x11-plugins/karamba-docker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/karamba-docker
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-docker/ChangeLog,v 1.1 2003/05/04 06:47:43 prez Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-docker/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+*karamba-docker-0.2 (29 Oct 2003)
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-docker-0.2.ebuild:
+  Added to ~ppc.
 
 *karamba-docker-0.84 (03 May 2003)
 
diff --git a/x11-plugins/karamba-docker/Manifest b/x11-plugins/karamba-docker/Manifest
index e69de29bb2d1..ebc0b4c74790 100644
--- a/x11-plugins/karamba-docker/Manifest
+++ b/x11-plugins/karamba-docker/Manifest
@@ -0,0 +1,3 @@
+MD5 57b3f42bdf47c868979e7513d4b90190 karamba-docker-0.2.ebuild 1062
+MD5 dedac96dcfdb9d41a7d53c4ed6734226 ChangeLog 485
+MD5 2ebec26a0a4cfcf36eed6c1f06a87f37 files/digest-karamba-docker-0.2 64
diff --git a/x11-plugins/karamba-docker/karamba-docker-0.2.ebuild b/x11-plugins/karamba-docker/karamba-docker-0.2.ebuild
index 84abe85bc20f..b9577319ceeb 100644
--- a/x11-plugins/karamba-docker/karamba-docker-0.2.ebuild
+++ b/x11-plugins/karamba-docker/karamba-docker-0.2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-docker/karamba-docker-0.2.ebuild,v 1.1 2003/05/04 06:47:43 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-docker/karamba-docker-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Docking menu plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5960"
 SRC_URI="http://www.kdelook.org/content/files/5960-docker.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND=">=x11-misc/superkaramba-0.21"
 
diff --git a/x11-plugins/karamba-kroller/ChangeLog b/x11-plugins/karamba-kroller/ChangeLog
index 2fcc6b41258f..0ed22f37b0cf 100644
--- a/x11-plugins/karamba-kroller/ChangeLog
+++ b/x11-plugins/karamba-kroller/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/karamba-kroller
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-kroller/ChangeLog,v 1.1 2003/05/04 02:36:08 prez Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-kroller/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  05 May 2005; Brian Jackson <iggy@gentoo.org> karamba-kroller-0.94.ebuild:
+  works on amd64
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-kroller-0.94.ebuild:
+  Added to ~ppc.
+
+*karamba-kroller-0.94 (13 Oct 2003)
+
+  13 Oct 2003; Martin Holzer <mholzer@gentoo.org> karamba-kroller-0.84.ebuild,
+  karamba-kroller-0.94.ebuild:
+  Version bumped. Closes #22620
 
 *karamba-kroller-0.84 (03 May 2003)
 
diff --git a/x11-plugins/karamba-kroller/Manifest b/x11-plugins/karamba-kroller/Manifest
index e69de29bb2d1..c93989a196c9 100644
--- a/x11-plugins/karamba-kroller/Manifest
+++ b/x11-plugins/karamba-kroller/Manifest
@@ -0,0 +1,5 @@
+MD5 7f4a41b57ec5a299a014e7866b9f6dc3 karamba-kroller-0.84.ebuild 1048
+MD5 1da48ccd296a30a6ae885753238b244a karamba-kroller-0.94.ebuild 1054
+MD5 47118ac4e96a29371856c388e2aa85b3 ChangeLog 726
+MD5 b50a57dec0d88968cc5ad1a6a03783b2 files/digest-karamba-kroller-0.84 70
+MD5 2bdccd8f1a4a905fd8620dbbeb267ab6 files/digest-karamba-kroller-0.94 70
diff --git a/x11-plugins/karamba-kroller/karamba-kroller-0.84.ebuild b/x11-plugins/karamba-kroller/karamba-kroller-0.84.ebuild
index 3fcc362c2a0f..c72a34a542b3 100644
--- a/x11-plugins/karamba-kroller/karamba-kroller-0.84.ebuild
+++ b/x11-plugins/karamba-kroller/karamba-kroller-0.84.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-kroller/karamba-kroller-0.84.ebuild,v 1.1 2003/05/04 02:36:08 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-kroller/karamba-kroller-0.84.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
-DESCRIPTION="Current Agenda plugin for Karamba"
-HOMEPAGE="http://www.kdelook.org/content/show.php?content=5931"
-SRC_URI="http://www.kdelook.org/content/files/5931-kroller-v${PV}.tar.gz"
+IUSE=""
+DESCRIPTION="Rolling menu plugin for Karamba"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=5931"
+SRC_URI="http://www.kde-look.org/content/files/5931-kroller-v${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
@@ -16,10 +17,6 @@ src_unpack () {
 	mv kroller-v${PV} ${P}
 }
 
-src_compile () {
-	echo -n ""
-}
-
 src_install () {
 	dodir /usr/share/karamba/themes/kroller
 	sed -e 's#import karamba#import karamba\nimport os#' \
diff --git a/x11-plugins/karamba-kroller/karamba-kroller-0.94.ebuild b/x11-plugins/karamba-kroller/karamba-kroller-0.94.ebuild
index d8bd56836712..fd1127a37500 100644
--- a/x11-plugins/karamba-kroller/karamba-kroller-0.94.ebuild
+++ b/x11-plugins/karamba-kroller/karamba-kroller-0.94.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-kroller/karamba-kroller-0.94.ebuild,v 1.1 2003/10/12 18:48:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-kroller/karamba-kroller-0.94.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Rolling menu plugin for Karamba"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=5931"
 SRC_URI="http://www.kde-look.org/content/files/5931-kroller-v${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~amd64"
 
 RDEPEND=">=x11-misc/superkaramba-0.32"
 
diff --git a/x11-plugins/karamba-news_panel/ChangeLog b/x11-plugins/karamba-news_panel/ChangeLog
index afadb88f89b2..5661b1de5671 100644
--- a/x11-plugins/karamba-news_panel/ChangeLog
+++ b/x11-plugins/karamba-news_panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/karamba-news_panel
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-news_panel/ChangeLog,v 1.1 2003/05/04 03:47:34 prez Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-news_panel/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-news_panel-0.5.ebuild:
+  Added to ~ppc.
+
+  11 Oct 2003; Martin Holzer <mholzer@gentoo.org>
+  karamba-news_panel-0.5.ebuild:
+  Added Depends. Closes #20782.
 
 *karamba-news_panel-0.5 (03 May 2003)
 
diff --git a/x11-plugins/karamba-news_panel/Manifest b/x11-plugins/karamba-news_panel/Manifest
index e69de29bb2d1..00879d19e5b3 100644
--- a/x11-plugins/karamba-news_panel/Manifest
+++ b/x11-plugins/karamba-news_panel/Manifest
@@ -0,0 +1,3 @@
+MD5 f6012dcd9f201151f7aba5e4fd0ed949 karamba-news_panel-0.5.ebuild 3357
+MD5 737cc665b62d818342bf40e6f41cbf5e ChangeLog 584
+MD5 144d2ebb32bcf4fa48af52e284266b6d files/digest-karamba-news_panel-0.5 70
diff --git a/x11-plugins/karamba-news_panel/karamba-news_panel-0.5.ebuild b/x11-plugins/karamba-news_panel/karamba-news_panel-0.5.ebuild
index 6ce997d14d51..60189de34b53 100644
--- a/x11-plugins/karamba-news_panel/karamba-news_panel-0.5.ebuild
+++ b/x11-plugins/karamba-news_panel/karamba-news_panel-0.5.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-news_panel/karamba-news_panel-0.5.ebuild,v 1.1 2003/05/04 03:47:34 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-news_panel/karamba-news_panel-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="RSS News plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5891"
 SRC_URI="http://www.kdelook.org/content/files/5891-news_panel-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
-RDEPEND=">=x11-misc/superkaramba-0.21"
+RDEPEND=">=x11-misc/superkaramba-0.21
+	dev-perl/HTML-Parser
+	dev-perl/libwww-perl"
 
 src_unpack () {
 	unpack ${A}
diff --git a/x11-plugins/karamba-odin/ChangeLog b/x11-plugins/karamba-odin/ChangeLog
index 8da9aaba54b2..1b52c1aa5fdb 100644
--- a/x11-plugins/karamba-odin/ChangeLog
+++ b/x11-plugins/karamba-odin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/karamba-odin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-odin/ChangeLog,v 1.1 2003/05/04 06:26:38 prez Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-odin/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+*karamba-odin-0.01 (29 Oct 2003)
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-odin-0.01.ebuild:
+  Added to ~ppc.
 
 *karamba-odin-0.1 (03 May 2003)
 
diff --git a/x11-plugins/karamba-odin/Manifest b/x11-plugins/karamba-odin/Manifest
index e69de29bb2d1..88d7be46da7e 100644
--- a/x11-plugins/karamba-odin/Manifest
+++ b/x11-plugins/karamba-odin/Manifest
@@ -0,0 +1,3 @@
+MD5 7397c9509f18df4bc5857a7ed98ed2d7 karamba-odin-0.01.ebuild 2139
+MD5 7b1ba2e9e278845dd2093d0347945418 ChangeLog 473
+MD5 10f3deb0218c9ea918ff8433e09edcf1 files/digest-karamba-odin-0.01 69
diff --git a/x11-plugins/karamba-odin/karamba-odin-0.01.ebuild b/x11-plugins/karamba-odin/karamba-odin-0.01.ebuild
index 9c7e15d5539f..0c63a44cf28b 100644
--- a/x11-plugins/karamba-odin/karamba-odin-0.01.ebuild
+++ b/x11-plugins/karamba-odin/karamba-odin-0.01.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-odin/karamba-odin-0.01.ebuild,v 1.1 2003/05/04 06:26:38 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-odin/karamba-odin-0.01.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Disk/floppy/CD status plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5820"
 SRC_URI="http://www.kdelook.org/content/files/5820-karamba_odin.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
diff --git a/x11-plugins/karamba-osxbar/ChangeLog b/x11-plugins/karamba-osxbar/ChangeLog
index 6310f6548bc8..0da0cc49a926 100644
--- a/x11-plugins/karamba-osxbar/ChangeLog
+++ b/x11-plugins/karamba-osxbar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/karamba-osxbar
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-osxbar/ChangeLog,v 1.1 2003/05/04 04:05:09 prez Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-osxbar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-osxbar-0.17g.ebuild:
+  Added to ~ppc.
 
 *karamba-osxbar-0.17g (03 May 2003)
 
diff --git a/x11-plugins/karamba-osxbar/Manifest b/x11-plugins/karamba-osxbar/Manifest
index e69de29bb2d1..823eca794394 100644
--- a/x11-plugins/karamba-osxbar/Manifest
+++ b/x11-plugins/karamba-osxbar/Manifest
@@ -0,0 +1,3 @@
+MD5 e93758f3cfdaabd49b0a110763fc3172 karamba-osxbar-0.17g.ebuild 1170
+MD5 82d5733569a4018ca9d13e50344c25f5 ChangeLog 454
+MD5 05a977ccd2c82c2b237078d1d419d733 files/digest-karamba-osxbar-0.17g 82
diff --git a/x11-plugins/karamba-osxbar/karamba-osxbar-0.17g.ebuild b/x11-plugins/karamba-osxbar/karamba-osxbar-0.17g.ebuild
index 9aa94757b9e8..6b8e0ee86df9 100644
--- a/x11-plugins/karamba-osxbar/karamba-osxbar-0.17g.ebuild
+++ b/x11-plugins/karamba-osxbar/karamba-osxbar-0.17g.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-osxbar/karamba-osxbar-0.17g.ebuild,v 1.1 2003/05/04 04:05:09 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-osxbar/karamba-osxbar-0.17g.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
-DESCRIPTION="Rolling menu plugin for Karamba"
+IUSE=""
+DESCRIPTION="Mac OSX style menu plugins for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5843"
 SRC_URI="http://www.kdelook.org/content/files/5843-osxbar-superkaramba-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND=">=x11-misc/superkaramba-0.21"
 
diff --git a/x11-plugins/karamba-smbwho/ChangeLog b/x11-plugins/karamba-smbwho/ChangeLog
index c674e67d6047..c6e6d44e9efe 100644
--- a/x11-plugins/karamba-smbwho/ChangeLog
+++ b/x11-plugins/karamba-smbwho/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for x11-plugins/karamba-weather
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-smbwho/ChangeLog,v 1.1 2003/05/04 01:46:30 prez Exp $
+# ChangeLog for x11-plugins/karamba-smbwho
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-smbwho/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-smbwho-0.1.ebuild:
+  Added to ~ppc.
 
 *karamba-smbwho-0.1 (03 May 2003)
 
diff --git a/x11-plugins/karamba-smbwho/Manifest b/x11-plugins/karamba-smbwho/Manifest
index e69de29bb2d1..dd0f40319532 100644
--- a/x11-plugins/karamba-smbwho/Manifest
+++ b/x11-plugins/karamba-smbwho/Manifest
@@ -0,0 +1,3 @@
+MD5 1100023b031b0f650b0fd9900ad0f766 karamba-smbwho-0.1.ebuild 1021
+MD5 acc2db04580a1b5b9e2c601bcc3b5133 ChangeLog 448
+MD5 79f054d8733a9292834078211827dba4 files/digest-karamba-smbwho-0.1 65
diff --git a/x11-plugins/karamba-smbwho/karamba-smbwho-0.1.ebuild b/x11-plugins/karamba-smbwho/karamba-smbwho-0.1.ebuild
index a34a30528612..ccdeddac0502 100644
--- a/x11-plugins/karamba-smbwho/karamba-smbwho-0.1.ebuild
+++ b/x11-plugins/karamba-smbwho/karamba-smbwho-0.1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-smbwho/karamba-smbwho-0.1.ebuild,v 1.1 2003/05/04 01:46:30 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-smbwho/karamba-smbwho-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Samba status plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5698"
 SRC_URI="http://www.kdelook.org/content/files/5698-smbwho-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
-RDEPEND="|| (x11-misc/karamba-0.17 x11-misc/superkaramba-0.21)"
+RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
 src_unpack () {
 	unpack ${A}
diff --git a/x11-plugins/karamba-sys/ChangeLog b/x11-plugins/karamba-sys/ChangeLog
index 492c6b179636..aa8604343baf 100644
--- a/x11-plugins/karamba-sys/ChangeLog
+++ b/x11-plugins/karamba-sys/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for x11-plugins/karamba-weather
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-sys/ChangeLog,v 1.1 2003/05/04 06:09:49 prez Exp $
+# ChangeLog for x11-plugins/karamba-sys
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-sys/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-sys-0.01.ebuild:
+  Added to ~ppc.
+
+  14 Oct 2003; Martin Holzer <mholzer@gentoo.org> karamba-sys-0.01.ebuild:
+  adding alternate. Closes #22675.
 
 *karamba-sys-0.01 (03 May 2003)
 
diff --git a/x11-plugins/karamba-sys/Manifest b/x11-plugins/karamba-sys/Manifest
index e69de29bb2d1..4aaa6ec2ccad 100644
--- a/x11-plugins/karamba-sys/Manifest
+++ b/x11-plugins/karamba-sys/Manifest
@@ -0,0 +1,3 @@
+MD5 7a290427a070f914e192b0c70fabe19f karamba-sys-0.01.ebuild 766
+MD5 b49143b3527b2d07115567bf7715f5ab ChangeLog 547
+MD5 562c409624a2b58f1d2f6d3e8b351f7d files/digest-karamba-sys-0.01 60
diff --git a/x11-plugins/karamba-sys/karamba-sys-0.01.ebuild b/x11-plugins/karamba-sys/karamba-sys-0.01.ebuild
index 271c08434420..7f19909a7ffb 100644
--- a/x11-plugins/karamba-sys/karamba-sys-0.01.ebuild
+++ b/x11-plugins/karamba-sys/karamba-sys-0.01.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-sys/karamba-sys-0.01.ebuild,v 1.1 2003/05/04 06:09:49 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-sys/karamba-sys-0.01.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Disk Usage plugin for Karamba"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=5823"
 SRC_URI="http://mgoransson.com/GENTOO/KDE/karamba_sys.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
-RDEPEND=">=x11-misc/karamba-0.17"
+RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
 src_unpack () {
 	unpack ${A}
diff --git a/x11-plugins/karamba-test/ChangeLog b/x11-plugins/karamba-test/ChangeLog
index a4ae0e6c4b3b..be786b940f46 100644
--- a/x11-plugins/karamba-test/ChangeLog
+++ b/x11-plugins/karamba-test/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for x11-plugins/karamba-weather
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-test/ChangeLog,v 1.1 2003/05/04 05:47:56 prez Exp $
+# ChangeLog for x11-plugins/karamba-test
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-test/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-test-0.17.ebuild:
+  Added to ~ppc.
 
 *karamba-test-0.17 (03 May 2003)
 
diff --git a/x11-plugins/karamba-test/Manifest b/x11-plugins/karamba-test/Manifest
index e69de29bb2d1..bdf49f07aac1 100644
--- a/x11-plugins/karamba-test/Manifest
+++ b/x11-plugins/karamba-test/Manifest
@@ -0,0 +1,3 @@
+MD5 699ebf08f103a0f36749f21df8ec6e23 karamba-test-0.17.ebuild 759
+MD5 b897d269b337815591b96eaaf45b6fae ChangeLog 441
+MD5 f4cc88b44a8cffe6a72884ed5354ab58 files/digest-karamba-test-0.17 62
diff --git a/x11-plugins/karamba-test/karamba-test-0.17.ebuild b/x11-plugins/karamba-test/karamba-test-0.17.ebuild
index ccf7ade5f09c..7ef7e7accad9 100644
--- a/x11-plugins/karamba-test/karamba-test-0.17.ebuild
+++ b/x11-plugins/karamba-test/karamba-test-0.17.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-test/karamba-test-0.17.ebuild,v 1.1 2003/05/04 05:47:56 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-test/karamba-test-0.17.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
-DESCRIPTION="Samba status plugin for Karamba"
+IUSE=""
+DESCRIPTION="Default plugins for Karamba"
 HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/"
 SRC_URI="http://www.efd.lth.se/~d98hk/karamba/karamba_test.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
@@ -24,6 +25,4 @@ src_install () {
 	dodir /usr/share/karamba/themes/test
 	cp -r * ${D}/usr/share/karamba/themes/test/
 	chmod -R go=u,go-w ${D}/usr/share/karamba/themes/test
-
-	dodoc README
 }
diff --git a/x11-plugins/karamba-time/ChangeLog b/x11-plugins/karamba-time/ChangeLog
index a8c3ad14e6a0..890e4eca3952 100644
--- a/x11-plugins/karamba-time/ChangeLog
+++ b/x11-plugins/karamba-time/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/karamba-time
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-time/ChangeLog,v 1.1 2003/05/04 05:49:56 prez Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-time/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-time-0.17.ebuild:
+  Added to ~ppc.
 
 *karamba-time-0.17 (03 May 2003)
 
diff --git a/x11-plugins/karamba-time/Manifest b/x11-plugins/karamba-time/Manifest
index e69de29bb2d1..2ecfa77dbc14 100644
--- a/x11-plugins/karamba-time/Manifest
+++ b/x11-plugins/karamba-time/Manifest
@@ -0,0 +1,3 @@
+MD5 e957558f127756c7b9acfc10e9ca085b karamba-time-0.17.ebuild 755
+MD5 a1a180f710245c4c4c05e5ba48e1ee9e ChangeLog 441
+MD5 52722ee4ebd05f2584f149ed70b40d1e files/digest-karamba-time-0.17 62
diff --git a/x11-plugins/karamba-time/karamba-time-0.17.ebuild b/x11-plugins/karamba-time/karamba-time-0.17.ebuild
index f0aad4bea508..e4bc14791bfc 100644
--- a/x11-plugins/karamba-time/karamba-time-0.17.ebuild
+++ b/x11-plugins/karamba-time/karamba-time-0.17.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-time/karamba-time-0.17.ebuild,v 1.1 2003/05/04 05:49:56 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-time/karamba-time-0.17.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
-DESCRIPTION="Samba status plugin for Karamba"
+IUSE=""
+DESCRIPTION="Time plugin for Karamba"
 HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/"
 SRC_URI="http://www.efd.lth.se/~d98hk/karamba/karamba_time.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
diff --git a/x11-plugins/karamba-tuxbar/ChangeLog b/x11-plugins/karamba-tuxbar/ChangeLog
index 978ff5f3fcb2..921b5c65d782 100644
--- a/x11-plugins/karamba-tuxbar/ChangeLog
+++ b/x11-plugins/karamba-tuxbar/ChangeLog
@@ -1,9 +1,12 @@
-# ChangeLog for x11-plugins/karamba-osxbar
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-tuxbar/ChangeLog,v 1.1 2003/05/04 04:15:22 prez Exp $
+# ChangeLog for x11-plugins/karamba-tuxbar
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-tuxbar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
-*karamba-osxbar-0.17g (03 May 2003)
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-tuxbar-0.17g.ebuild:
+  Added to ~ppc.
 
-  03 May 2003; Preston A. Elder <prez@gentoo.org> karamba-osxbar-0.17g.ebuild:
+*karamba-tuxbar-0.17g (03 May 2003)
+
+  03 May 2003; Preston A. Elder <prez@gentoo.org> karamba-tuxbar-0.17g.ebuild:
   Initial import.
 
diff --git a/x11-plugins/karamba-tuxbar/Manifest b/x11-plugins/karamba-tuxbar/Manifest
index e69de29bb2d1..a6b86969e9d7 100644
--- a/x11-plugins/karamba-tuxbar/Manifest
+++ b/x11-plugins/karamba-tuxbar/Manifest
@@ -0,0 +1,3 @@
+MD5 10d9a8b44685abcfd39b8c56784e027a karamba-tuxbar-0.17g.ebuild 885
+MD5 fa434449148ddd10d18612b585c0db3d ChangeLog 454
+MD5 ea870d0d69c822e74b972993c28d7dd2 files/digest-karamba-tuxbar-0.17g 75
diff --git a/x11-plugins/karamba-tuxbar/karamba-tuxbar-0.17g.ebuild b/x11-plugins/karamba-tuxbar/karamba-tuxbar-0.17g.ebuild
index 8a934f1a3e0c..9d0da013fb46 100644
--- a/x11-plugins/karamba-tuxbar/karamba-tuxbar-0.17g.ebuild
+++ b/x11-plugins/karamba-tuxbar/karamba-tuxbar-0.17g.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-tuxbar/karamba-tuxbar-0.17g.ebuild,v 1.1 2003/05/04 04:15:22 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-tuxbar/karamba-tuxbar-0.17g.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Rolling menu plugin for Karamba"
 HOMEPAGE="http://www.kdelook.org/content/show.php?content=5812"
 SRC_URI="http://www.kdelook.org/content/files/5812-tuxbar-pzoom-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND=">=x11-misc/superkaramba-0.21"
 
diff --git a/x11-plugins/karamba-webcam/ChangeLog b/x11-plugins/karamba-webcam/ChangeLog
index 9c1bee9dee50..5cf972f01145 100644
--- a/x11-plugins/karamba-webcam/ChangeLog
+++ b/x11-plugins/karamba-webcam/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for x11-plugins/karamba-weather
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-webcam/ChangeLog,v 1.1 2003/05/04 06:00:26 prez Exp $
+# ChangeLog for x11-plugins/karamba-webcam
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-webcam/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+*karamba-webcam-0.17 (29 Oct 2003)
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-webcam-0.17.ebuild:
+  Added to ~ppc.
 
 *karamba-test-0.17 (03 May 2003)
 
diff --git a/x11-plugins/karamba-webcam/Manifest b/x11-plugins/karamba-webcam/Manifest
index e69de29bb2d1..6c96872bf9a0 100644
--- a/x11-plugins/karamba-webcam/Manifest
+++ b/x11-plugins/karamba-webcam/Manifest
@@ -0,0 +1,3 @@
+MD5 ba5e5bcf05d5f4a7b09cdaff4cd8a91d karamba-webcam-0.17.ebuild 979
+MD5 19a6734c9bd66c92ae1044dad0ed0278 ChangeLog 483
+MD5 77dc4744a9fb5e66b59bf95873be9813 files/digest-karamba-webcam-0.17 56
diff --git a/x11-plugins/karamba-webcam/karamba-webcam-0.17.ebuild b/x11-plugins/karamba-webcam/karamba-webcam-0.17.ebuild
index 376a7170781c..abb067dc0a0f 100644
--- a/x11-plugins/karamba-webcam/karamba-webcam-0.17.ebuild
+++ b/x11-plugins/karamba-webcam/karamba-webcam-0.17.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-webcam/karamba-webcam-0.17.ebuild,v 1.1 2003/05/04 06:00:26 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-webcam/karamba-webcam-0.17.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Webcam plugin for Karamba"
 HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/"
 SRC_URI="http://www.efd.lth.se/~d98hk/karamba/karcam.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 RDEPEND="|| ( >=x11-misc/karamba-0.17 >=x11-misc/superkaramba-0.21 )"
 
diff --git a/x11-plugins/karamba-xmmsbar/ChangeLog b/x11-plugins/karamba-xmmsbar/ChangeLog
index 34289deaafc4..afb11e724664 100644
--- a/x11-plugins/karamba-xmmsbar/ChangeLog
+++ b/x11-plugins/karamba-xmmsbar/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-plugins/karamba-xmmsbar
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-xmmsbar/ChangeLog,v 1.1 2003/05/04 04:48:08 prez Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-xmmsbar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +metadata.xml,
+  karamba-xmmsbar-0.3.ebuild:
+  corrected S to fix #73010 and added metadata.xml
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  karamba-xmmsbar-0.3.ebuild:
+  Masked karamba-xmmsbar-0.3.ebuild stable for ppc
+
+  20 Jun 2004; Carsten Lohrke <carlo@gentoo.org> karamba-xmmsbar-0.3.ebuild:
+  QA: minor fix
+
+  29 Oct 2003; David Holm <dholm@gentoo.org> karamba-xmmsbar-0.3.ebuild:
+  Added to ~ppc.
 
 *karamba-xmmsbar-0.3 (03 May 2003)
 
diff --git a/x11-plugins/karamba-xmmsbar/Manifest b/x11-plugins/karamba-xmmsbar/Manifest
index e69de29bb2d1..e1706819a5b9 100644
--- a/x11-plugins/karamba-xmmsbar/Manifest
+++ b/x11-plugins/karamba-xmmsbar/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0c24898783d8b7dfec675d51e2c0572f karamba-xmmsbar-0.3.ebuild 891
+MD5 b771f64719ad7b61f3b4b330e023c108 ChangeLog 838
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 cdcd5257ddacd126c46641a5d7e4f9b5 files/digest-karamba-xmmsbar-0.3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCMLYs06ebR+OMO78RAp6sAJ0bnN+sbluuDJsSaF6IE3PDV0UCPwCeMTUD
+YkTIzMCx7robqFsWmg7OFiY=
+=m36+
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/karamba-xmmsbar/karamba-xmmsbar-0.3.ebuild b/x11-plugins/karamba-xmmsbar/karamba-xmmsbar-0.3.ebuild
index c26769fdc508..9c3e486f600e 100644
--- a/x11-plugins/karamba-xmmsbar/karamba-xmmsbar-0.3.ebuild
+++ b/x11-plugins/karamba-xmmsbar/karamba-xmmsbar-0.3.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-xmmsbar/karamba-xmmsbar-0.3.ebuild,v 1.1 2003/05/04 04:48:08 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/karamba-xmmsbar/karamba-xmmsbar-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+S=${WORKDIR}/xmmsbar
+
+DESCRIPTION="XMMS plugin for Karamba"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=5882"
+SRC_URI="http://www.kde-look.org/content/files/5882-xmmsbar-${PV}.tar.gz"
 
-DESCRIPTION="Rolling menu plugin for Karamba"
-HOMEPAGE="http://www.kdelook.org/content/show.php?content=5882"
-SRC_URI="http://www.kdelook.org/content/files/5882-xmmsbar-${PV}.tar.gz"
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc ~amd64"
+IUSE=""
 
 RDEPEND=">=x11-misc/superkaramba-0.21
 	>=media-sound/xmmsctrl-1.6"
 
-src_unpack () {
-	unpack ${A}
-	mv xmmsbar ${P}
-}
-
 src_compile () {
 	echo -n ""
 }
@@ -27,6 +26,5 @@ src_install () {
 	cp xmmsbar.py ${D}/usr/share/karamba/themes/xmmsbar
 	cp -r pics ${D}/usr/share/karamba/themes/xmmsbar
 	chmod -R go=u,go-w ${D}/usr/share/karamba/themes/xmmsbar
-
 	dodoc README
 }
diff --git a/x11-plugins/khexclock/ChangeLog b/x11-plugins/khexclock/ChangeLog
index df890e01cb20..816f5675e113 100644
--- a/x11-plugins/khexclock/ChangeLog
+++ b/x11-plugins/khexclock/ChangeLog
@@ -1,10 +1,29 @@
 # ChangeLog for x11-plugins/khexclock
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/khexclock/ChangeLog,v 1.1 2003/11/10 10:11:24 luke-jr Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/khexclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
-*khexclock-0.0.3 (10 Nov 2003)
+*khexclock-0.1.5 (27 Jul 2005)
 
-  10 Nov 2003; Luke-Jr <luke-jr@gentoo.org> khexclock-0.0.3.ebuild,
-  metadata.xml:
-  Initial package creation
+  27 Jul 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml,
+  khexclock-0.0.4.ebuild, +khexclock-0.1.5.ebuild:
+  #81976: version bump and added a homepage
+
+  01 May 2005; Carsten Lohrke <carlo@gentoo.org> khexclock-0.0.4.ebuild:
+  QA: replaced ebuild - using econf/emake is not valid for kde apps, #90883
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  khexclock-0.0.4.ebuild:
+  Masked khexclock-0.0.4.ebuild stable for ppc
+
+  13 Aug 2004; Jon Hood <squinky86@gentoo.org> khexclock-0.0.4.ebuild:
+  Stable on x86.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> khexclock-0.0.4.ebuild:
+  Added to ~ppc.
+
+*khexclock-0.0.4 (14 Jul 2004)
+
+  14 Jul 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  +khexclock-0.0.4.ebuild:
+  recommitting new version irt #57077, thanks Luke-Jr
 
diff --git a/x11-plugins/khexclock/Manifest b/x11-plugins/khexclock/Manifest
index 8297f857784b..3f9dfc2e42e1 100644
--- a/x11-plugins/khexclock/Manifest
+++ b/x11-plugins/khexclock/Manifest
@@ -1,3 +1,16 @@
-MD5 c371bb5fcd737618d9ffaa0f244f1071 khexclock-0.0.3.ebuild 338
-MD5 e87b3678e030d075d0121afa4c90e637 metadata.xml 451
-MD5 761f9be8c1f0e5297be475373e221c8e files/digest-khexclock-0.0.3 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76b17e9994305d216598a0cff2dcc80f ChangeLog 1042
+MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
+MD5 5b219e0abd1ec896c4e14ba2f8e35add khexclock-0.0.4.ebuild 513
+MD5 c6a8788d4dd2196e289039afb36d340b khexclock-0.1.5.ebuild 504
+MD5 b24363e04cf2e3c2ef94d41033a4e0be files/digest-khexclock-0.1.5 65
+MD5 0bfcfd82e6f99a49ee4617c9e669ad8e files/digest-khexclock-0.0.4 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC58NOl5AvwDPiUowRAhNGAJ4qdn+MdujnLalIWIJRza/NbYeyuwCgjbqi
+woGx8SE1JspWeb2Cg+Hur3Y=
+=svjb
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/khexclock/khexclock-0.0.4.ebuild b/x11-plugins/khexclock/khexclock-0.0.4.ebuild
index 6f3d42eec70f..e0578160700a 100644
--- a/x11-plugins/khexclock/khexclock-0.0.4.ebuild
+++ b/x11-plugins/khexclock/khexclock-0.0.4.ebuild
@@ -1,23 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/khexclock/khexclock-0.0.4.ebuild,v 1.1 2004/07/15 01:38:08 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/khexclock/khexclock-0.0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit kde
-need-kde 3
 
 IUSE=""
 DESCRIPTION="KHexClock shows the current hexadecimal time and date."
-HOMEPAGE=""
-SRC_URI="http://mystery.ryalth.com/~luke-jr/${P}.tbz2"
+HOMEPAGE="http://utopios.org/~luke-jr/programs/khexclock/"
+SRC_URI="http://mystery.ryalth.com/~luke-jr/programs/khexclock/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-src_compile() {
-	econf || die
-	emake || die
-}
+KEYWORDS="x86 ~amd64 ppc"
 
-src_install() {
-	make DESTDIR=${D} install || die
-}
+need-kde 3
diff --git a/x11-plugins/khexclock/khexclock-0.1.5.ebuild b/x11-plugins/khexclock/khexclock-0.1.5.ebuild
index 9ae99b33ebff..8a89b7975123 100644
--- a/x11-plugins/khexclock/khexclock-0.1.5.ebuild
+++ b/x11-plugins/khexclock/khexclock-0.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/khexclock/khexclock-0.1.5.ebuild,v 1.1 2005/07/27 17:23:36 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/khexclock/khexclock-0.1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit kde
 
diff --git a/x11-plugins/khexclock/metadata.xml b/x11-plugins/khexclock/metadata.xml
index b42f8a0ba370..40838bc36783 100644
--- a/x11-plugins/khexclock/metadata.xml
+++ b/x11-plugins/khexclock/metadata.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-other</herd>
-<maintainer>
-  <email>luke-jr@gentoo.org</email>
-  <name>Luke-Jr</name>
-  <description>modified from the original Clock applet; ebuild maintained within khexclock sources</description>
-</maintainer>
-<longdescription>KHexClock shows the current hexadecimal time and date.</longdescription>
+<herd>desktop-misc</herd>
 </pkgmetadata>
diff --git a/x11-plugins/licq-osd/ChangeLog b/x11-plugins/licq-osd/ChangeLog
index 516ccb7268cb..4135f4a638f1 100644
--- a/x11-plugins/licq-osd/ChangeLog
+++ b/x11-plugins/licq-osd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/licq-osd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/ChangeLog,v 1.1 2004/08/20 14:55:38 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
+
+*licq-osd-1.2.7.5-r1 (15 Mar 2005)
+
+  15 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> -licq-osd-1.2.7.5.ebuild,
+  +licq-osd-1.2.7.5-r1.ebuild:
+  Closing bug #85265.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> licq-osd-1.2.7.5.ebuild:
+  Added to ~ppc.
 
 *licq-osd-1.2.7.5 (20 Aug 2004)
 
diff --git a/x11-plugins/licq-osd/Manifest b/x11-plugins/licq-osd/Manifest
index ab299070ed6e..a24614750e11 100644
--- a/x11-plugins/licq-osd/Manifest
+++ b/x11-plugins/licq-osd/Manifest
@@ -1,2 +1,4 @@
-MD5 6d4c04dd4fda0cf7a405830d0598a7dc licq-osd-1.2.7.5.ebuild 835
-MD5 a287306e772ef63ee11f4dfe524a2654 files/digest-licq-osd-1.2.7.5 60
+MD5 2834f1cb97eea873f19ab95ccad6bc6d metadata.xml 216
+MD5 b2c06de3572c89f048dab8cfda696456 ChangeLog 693
+MD5 22d9624d515642914727020766985b26 licq-osd-1.2.7.5-r1.ebuild 840
+MD5 a287306e772ef63ee11f4dfe524a2654 files/digest-licq-osd-1.2.7.5-r1 60
diff --git a/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild b/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild
index 427e5b321472..e1c98f52188d 100644
--- a/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild
+++ b/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild,v 1.1 2005/03/15 12:51:03 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 MY_PN="licq_osd_plugin"
 DESCRIPTION="On Screen Display for licq"
diff --git a/x11-plugins/licq-osd/metadata.xml b/x11-plugins/licq-osd/metadata.xml
index 051cbc4ed73a..f360420caeb2 100644
--- a/x11-plugins/licq-osd/metadata.xml
+++ b/x11-plugins/licq-osd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-other</herd>
+<herd>kde</herd>
 <maintainer>
 	<email>voxus@gentoo.org</email>
 </maintainer>
diff --git a/x11-plugins/metadata.xml b/x11-plugins/metadata.xml
index e07c3dd3df4f..d2d46676fc40 100644
--- a/x11-plugins/metadata.xml
+++ b/x11-plugins/metadata.xml
@@ -5,5 +5,27 @@
 		The x11-plugins category contains plugin packages for various X11
 		applications.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-plugins enthält Plugins für verschiedene 
+		X11-Applikationen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-plugins contiene paquetes de extensiones para
+		varias aplicaciones X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-pluginsカテゴリーには様々なX11アプリケーションの
+		プラグイン・パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De x11-plugins categorie bevat plugins voor verschillende 
+		X11-applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-plugins chứa các gói plugin cho các ứng dụng X11 khác nhau.
+	</longdescription>
+	<longdescription lang="it">
+		La categoría x11-plugins contiene paccketti di estensioni per varie applicazioni X11.
+	</longdescription>
 </catmetadata>
 
diff --git a/x11-plugins/mountapp/ChangeLog b/x11-plugins/mountapp/ChangeLog
index 114bd429039b..9011df03f4c0 100644
--- a/x11-plugins/mountapp/ChangeLog
+++ b/x11-plugins/mountapp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/mountapp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/ChangeLog,v 1.1 2002/12/09 08:08:19 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  10 May 2005; Michele Noberasco <s4t4n@gentoo.org> mountapp-3.0.ebuild:
+  Added gtk+ dependancy, closing bug #91578...
+
+  07 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> mountapp-3.0.ebuild:
+  Marked ~amd64, closes bug 83853.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> mountapp-3.0.ebuild:
+  glibc -> libc
 
 *mountapp-3.0 (10 Dec 2002)
 
diff --git a/x11-plugins/mountapp/Manifest b/x11-plugins/mountapp/Manifest
index e69de29bb2d1..7eeaf51de410 100644
--- a/x11-plugins/mountapp/Manifest
+++ b/x11-plugins/mountapp/Manifest
@@ -0,0 +1,4 @@
+MD5 d660c729ac974f123478067ab724ee64 mountapp-3.0.ebuild 749
+MD5 437e3e2ac3d0b0aa789b1726761bbe3c ChangeLog 671
+MD5 e4a837b9af84bef3c70c3974bc982d71 metadata.xml 519
+MD5 0d1607c39526de2638a27876059ab40d files/digest-mountapp-3.0 64
diff --git a/x11-plugins/mountapp/mountapp-3.0.ebuild b/x11-plugins/mountapp/mountapp-3.0.ebuild
index a30138d19913..d763d890762b 100644
--- a/x11-plugins/mountapp/mountapp-3.0.ebuild
+++ b/x11-plugins/mountapp/mountapp-3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/mountapp-3.0.ebuild,v 1.1 2002/12/09 08:08:19 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/mountapp-3.0.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 DESCRIPTION="mount filesystems via an easy-to-use windowmaker applet"
 HOMEPAGE="http://mountapp.sourceforge.net"
@@ -8,14 +8,13 @@ SRC_URI="http://mountapp.sourceforge.net/mountapp-3.0.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc ~amd64"
 
 IUSE=""
 
-DEPEND="virtual/glibc
-	>=x11-wm/WindowMaker-0.80"
-
-S=${WORKDIR}/${P}
+DEPEND="virtual/libc
+	=x11-libs/gtk+-1.2*
+	>=x11-wm/windowmaker-0.80"
 
 src_compile() {
 
diff --git a/x11-plugins/wmCalClock/ChangeLog b/x11-plugins/wmCalClock/ChangeLog
index f9113d60f291..39c6c7c61547 100644
--- a/x11-plugins/wmCalClock/ChangeLog
+++ b/x11-plugins/wmCalClock/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for x11-plugins/wmCalClock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmCalClock-1.25-r1.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  13 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> wmCalClock-1.25-r1.ebuild:
+  Added some magic sed to remove unneeded SYSTEM variable from Makefile,
+  fixing bug #105730.
+
+  31 Aug 2004; Tom Gall <tgall@gentoo.org> wmCalClock-1.25-r1.ebuild:
+  stable on ppc64, bug #61761
+
+  20 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmCalClock-1.25-r1.ebuild:
+  Fixed the ebuild so that it does actually produce a working binary.
+  How on Earth is possible that this ebuild is stable for lots of arches
+  while not even producing a binary?!? Closes #57123.
+  wmCalClock-1.25-r1.ebuild:
+  Wipe out old ebuilds...
+
+  07 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
+  wmCalClock-1.25-r1.ebuild:
+  Added ~mips keyword.
+
+  17 Jun 2003; Will Woods <wwoods@gentoo.org> wmCalClock-1.25-r1.ebuild:
+  Added alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+
+*wmCalClock-1.25-r1 (03 Nov 2002)
+
+  03 Nov 2002; Seemant Kulleen <seemant@gentoo.org> wmCalClock-1.25-r1.ebuild
+  files/digest-wmCalClock-1.25-r1 :
+
+  Made FHS compliant and installed documentation
 
 *wmCalClock-1.25 (1 Feb 2002)
 
diff --git a/x11-plugins/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest
index e69de29bb2d1..c6e4cc5ee62d 100644
--- a/x11-plugins/wmCalClock/Manifest
+++ b/x11-plugins/wmCalClock/Manifest
@@ -0,0 +1,4 @@
+MD5 e5761a1a08ad9f50a4b0814877e3952e ChangeLog 1983
+MD5 6d9654d15ecf5bcf08849c35ffd5845b metadata.xml 392
+MD5 3dc8291b6d8dbc92e714713cbf1b3ee2 wmCalClock-1.25-r1.ebuild 882
+MD5 aa77ec8a98d18d95b902c9808e5b96e2 files/digest-wmCalClock-1.25-r1 66
diff --git a/x11-plugins/wmCalClock/metadata.xml b/x11-plugins/wmCalClock/metadata.xml
index aa2fd25be9fe..e77e67165d89 100644
--- a/x11-plugins/wmCalClock/metadata.xml
+++ b/x11-plugins/wmCalClock/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild
index c34c3ec14100..a67439fe3d2e 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild,v 1.1 2002/11/03 15:54:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+IUSE=""
 
-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"
@@ -11,16 +12,30 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc alpha amd64 ~mips ppc ppc64"
+
+S=${WORKDIR}/${P}/Src
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# remove unneeded SYSTEM variable from Makefile, fixing bug #105730
+	cd ${S}
+	sed -i -e "s:\$(SYSTEM)::" Makefile
+}
 
-src_compile() {
-	emake || die
+src_compile()
+{
+	emake CFLAGS="${CFLAGS}" || die "Compilation failed"
 }
 
-src_install () {
+src_install()
+{
 	dobin ${PN}
 	doman ${PN}.1
 
 	cd ..
-	dodoc BUGS CHANGES COPYING HINTS INSTALL README TODO
+	dodoc BUGS CHANGES HINTS README TODO
 }
diff --git a/x11-plugins/wmDownload/ChangeLog b/x11-plugins/wmDownload/ChangeLog
index 8f75da809a07..05dff8ef07e4 100644
--- a/x11-plugins/wmDownload/ChangeLog
+++ b/x11-plugins/wmDownload/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/wmDownload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/ChangeLog,v 1.1 2002/10/03 17:53:09 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmDownload-0.1.2a.ebuild:
+  Added ~sparc keyword.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> wmDownload-0.1.2a.ebuild:
+  Typo in DESCRIPTION: recieve -> receive. Bug 59717.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmDownload-0.1.2a.ebuild:
+  glibc -> libc, add sed-4 dep
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmDownload-0.1.2a.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
 *wmDownload-0.1.2a (04 Oct 2002)
 
diff --git a/x11-plugins/wmDownload/Manifest b/x11-plugins/wmDownload/Manifest
index e69de29bb2d1..66a2f651ef41 100644
--- a/x11-plugins/wmDownload/Manifest
+++ b/x11-plugins/wmDownload/Manifest
@@ -0,0 +1,4 @@
+MD5 b10d7cc5b9500e4d75a9743cf6d85077 ChangeLog 883
+MD5 fb2a585e2b049ef6947cae0446e72ca6 metadata.xml 358
+MD5 8ee44c52f4d5ced84f9a203178a6789f wmDownload-0.1.2a.ebuild 769
+MD5 926d9418442030e75ec55d282eb43565 files/digest-wmDownload-0.1.2a 68
diff --git a/x11-plugins/wmDownload/metadata.xml b/x11-plugins/wmDownload/metadata.xml
index 9a772b80a291..fcd21bb4bb31 100644
--- a/x11-plugins/wmDownload/metadata.xml
+++ b/x11-plugins/wmDownload/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild b/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild
index 30b6c8cb71c9..24f14a42dbf3 100644
--- a/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild
+++ b/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild
@@ -1,35 +1,32 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2002/10/03 17:53:09 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmDownload/wmDownload-0.1.2a.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 S=${WORKDIR}/wmDownload
 
-DESCRIPTION="dockapp that displays how much data you've recieved on each eth and ppp device."
+IUSE=""
+DESCRIPTION="dockapp that displays how much data you've received on each eth and ppp device."
 SRC_URI="mirror://sourceforge/wmdownload/${P}.tar.gz"
 HOMEPAGE="http://wmdownload.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORKS="x86"
+KEYWORDS="x86 amd64 ppc ~sparc"
 
-DEPEND="virtual/glibc x11-base/xfree x11-libs/docklib"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc virtual/x11 x11-libs/docklib
+	>=sys-apps/sed-4"
 
-src_compile() {
-
-	cd ${S}
-
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:$CFLAGS:" Makefile.orig > Makefile
-
-	emake || die 
+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
-
+	dobin wmDownload
 }
diff --git a/x11-plugins/wmMatrix/ChangeLog b/x11-plugins/wmMatrix/ChangeLog
index ef7d2f16aa22..0cf20018c133 100644
--- a/x11-plugins/wmMatrix/ChangeLog
+++ b/x11-plugins/wmMatrix/ChangeLog
@@ -1,7 +1,19 @@
 # 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 $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
 
+  07 Mar 2005; Markus Rothe <corsair@gentoo.org> wmMatrix-0.2.ebuild:
+  Stable on ppc64
+
+  25 Jan 2005; Markus Rothe <corsair@gentoo.org> wmMatrix-0.2.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #79357
+
+  28 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmMatrix-0.2.ebuild:
+  Changed HOMEPAGE and SRC_URI to the www.dockapps.org ones, as the
+  original package homepage no longer exists...
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmMatrix-0.2 (7-Feb-2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index e69de29bb2d1..d5d0a3e34d53 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -0,0 +1,4 @@
+MD5 d8d1676cae62d013adaded924b4a7a3f ChangeLog 899
+MD5 0060e80254a376d3b38e8ad3a50b1e06 metadata.xml 307
+MD5 1a377633ab3b59dcbcccf1572aab5e78 wmMatrix-0.2.ebuild 665
+MD5 6f6559aa635890cb92c9ba40f675084f files/digest-wmMatrix-0.2 64
diff --git a/x11-plugins/wmMatrix/metadata.xml b/x11-plugins/wmMatrix/metadata.xml
index c4cac3886e00..6c36f8b48eb9 100644
--- a/x11-plugins/wmMatrix/metadata.xml
+++ b/x11-plugins/wmMatrix/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
index e377e2cdb106..f3611ad89fa4 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
@@ -1,17 +1,17 @@
-# Copyright (c) Vitaly Kushneriuk
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 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"
+SRC_URI="http://www.dockapps.org/download.php/id/17/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.org/file.php/id/10"
 
 DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc amd64 ppc ppc64"
 
 src_compile() {
 	# this version is distributed with compiled binaries!
diff --git a/x11-plugins/wmMoonClock/ChangeLog b/x11-plugins/wmMoonClock/ChangeLog
index 1a820669ce0b..71f0100ec055 100644
--- a/x11-plugins/wmMoonClock/ChangeLog
+++ b/x11-plugins/wmMoonClock/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmMoonClock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.1 2002/10/08 13:11:51 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmMoonClock-1.27.ebuild:
+  Added ~sparc keyword.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmMoonClock-1.27.ebuild:
+  glibc -> libc, add sed-4 dep
+
+  07 Mar 2004; Stephen P. Becker <geoman@gentoo.org> wmMoonClock-1.27.ebuild:
+  Added ~mips keyword.
 
 *wmMoonClock-1.27 (08 Oct 2002)
 
diff --git a/x11-plugins/wmMoonClock/Manifest b/x11-plugins/wmMoonClock/Manifest
index e69de29bb2d1..dadc3207bf37 100644
--- a/x11-plugins/wmMoonClock/Manifest
+++ b/x11-plugins/wmMoonClock/Manifest
@@ -0,0 +1,4 @@
+MD5 fac60ece446c470b33c4dff1fdb56b5b ChangeLog 691
+MD5 3cd7a2046b4387618be4a9962cbb867d metadata.xml 622
+MD5 07fd352d078ff18c6b3f9d59105115a2 wmMoonClock-1.27.ebuild 783
+MD5 7ca0d493291ab50558642db09f223acc files/digest-wmMoonClock-1.27 68
diff --git a/x11-plugins/wmMoonClock/metadata.xml b/x11-plugins/wmMoonClock/metadata.xml
index 1df7b872514e..fcc813de2b5a 100644
--- a/x11-plugins/wmMoonClock/metadata.xml
+++ b/x11-plugins/wmMoonClock/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
index f7869c908063..9cfde724e91a 100644
--- a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
+++ b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
@@ -1,39 +1,32 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2002/10/08 13:11:51 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy."
 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
-	virtual/x11"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc
+	virtual/x11
+	>=sys-apps/sed-4"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ~mips ppc ~sparc"
 
 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"
-
+	emake -C Src || die "parallel make failed"
 }
 
 src_install () {
-
-        dobin Src/wmMoonClock
-        doman Src/wmMoonClock.1
-        dodoc BUGS
-
+	dobin Src/wmMoonClock
+	doman Src/wmMoonClock.1
+	dodoc BUGS
 }
 
diff --git a/x11-plugins/wmSMPmon/ChangeLog b/x11-plugins/wmSMPmon/ChangeLog
index 523e8ca223ff..0fc4154d91b9 100644
--- a/x11-plugins/wmSMPmon/ChangeLog
+++ b/x11-plugins/wmSMPmon/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for x11-plugins/wmSMPmon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.1 2002/10/04 18:27:23 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  08 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmSMPmon-2.2.ebuild:
+  Wiped out older version...
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> wmSMPmon-2.3.ebuild:
+  stable on amd64
+
+  08 Feb 2005; Michele Noberasco <s4t4n@gentoo.org> wmSMPmon-2.3.ebuild:
+  Stable for x86. Fix copyright headers.
+  wmSMPmon-2.3.ebuild:
+  Fix copyright headers.
+  metadata.xml:
+  Assigned to desktop-dock herd.
+
+*wmSMPmon-2.3 (11 Aug 2004)
+
+  11 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmSMPmon-2.3.ebuild:
+  Version bump.
+  wmSMPmon-2.2.ebuild:
+  Update ebuild, correct S variable. It always segfaults on me but I assume
+  this is because I don't have SMP capable hardware (and thus an SMP enabled
+  kernel), so I'll leave it unmasked.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmSMPmon-2.2.ebuild:
+  glibc -> libc, add sed-4 dep
 
 *wmSMPmon-2.2 (04 Oct 2002)
 
diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
index e69de29bb2d1..78a740fd82f6 100644
--- a/x11-plugins/wmSMPmon/Manifest
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -0,0 +1,4 @@
+MD5 ab545c0b7e89363e5fcffc09de64dcd9 wmSMPmon-2.3.ebuild 672
+MD5 b4df1613c6f038fa66f415ed1921ef63 ChangeLog 1215
+MD5 2f938fdc30cbd2797b34e0be85dac29d metadata.xml 295
+MD5 b7b6f586d1eb16de54d56747453ad5ff files/digest-wmSMPmon-2.3 63
diff --git a/x11-plugins/wmSMPmon/metadata.xml b/x11-plugins/wmSMPmon/metadata.xml
index 38d28ab94f50..09a0b0457a0d 100644
--- a/x11-plugins/wmSMPmon/metadata.xml
+++ b/x11-plugins/wmSMPmon/metadata.xml
@@ -1,9 +1,7 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+<herd>desktop-dock</herd>
 <longdescription>
 wmSMPmon is a Window Maker applet for monitoring
 the CPUs, memory, and swap of SMP systems. 
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild
index 40f4b02c266a..bc9fb9856b44 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild,v 1.1 2004/08/11 13:04:51 s4t4n Exp $
-
-S="${WORKDIR}/${PN}-2.x"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="SMP system monitor dockapp"
@@ -11,7 +9,7 @@ SRC_URI="http://goupilfr.org/arch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND="virtual/libc
 	virtual/x11
diff --git a/x11-plugins/wmSpaceWeather/ChangeLog b/x11-plugins/wmSpaceWeather/ChangeLog
index e6f2b3982fe4..9700ead4c5d7 100644
--- a/x11-plugins/wmSpaceWeather/ChangeLog
+++ b/x11-plugins/wmSpaceWeather/ChangeLog
@@ -1,9 +1,28 @@
 # ChangeLog for x11-plugins/wmSpaceWeather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.1 2002/10/08 14:30:47 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmSpaceWeather-1.04.ebuild:
+  Added ~sparc keyword.
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> wmSpaceWeather-1.04.ebuild:
+  Inherit eutils, marking stable on hppa
+
+  29 Mar 2004; Markus Nigbur <pyrania@gentoo.org> wmSpaceWeather-1.04.ebuild,
+  files/getkp.patch:
+  Kp index location on noaa changed. Closing bug #45803.
+
+  07 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
+  wmSpaceWeather-1.04.ebuild:
+  Added ~mips keyword.
 
 *wmSpaceWeather-1.04 (08 Oct 2002)
 
+  18 Jan 2003; Seemant Kulleen <seemant@gentoo.org>
+  wmSpaceWeather-1.04.ebuild :
+
+  Removed spurious dependency on WindowMaker.
+
   08 Oct 2002; Nick Hadaway <raker@gentoo.org>
   wmSpaceWeather-1.04.ebuild, files/digest-wmSpaceWeather-1.04 :
   New ebuild.  See bug #5037
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index e69de29bb2d1..d4cd2eb466f4 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -0,0 +1,5 @@
+MD5 47366f7a14e94d33ae0092e7daf68cbb ChangeLog 1012
+MD5 8528979e79580bcdb1a8d92a70b79fff metadata.xml 258
+MD5 907d064cebffef2532039e230b980615 wmSpaceWeather-1.04.ebuild 894
+MD5 2c43841b9a7de02ed1c9db41aac92e0c files/digest-wmSpaceWeather-1.04 70
+MD5 6a922302393e3d85a5997f24a7703587 files/getkp.patch 836
diff --git a/x11-plugins/wmSpaceWeather/metadata.xml b/x11-plugins/wmSpaceWeather/metadata.xml
index e4e998ebb1b4..782652707f74 100644
--- a/x11-plugins/wmSpaceWeather/metadata.xml
+++ b/x11-plugins/wmSpaceWeather/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild
index 127166914e48..bb2e180dd3b5 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild
@@ -1,38 +1,31 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild,v 1.1 2002/10/08 14:30:47 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
-IUSE=""
-
-S="${WORKDIR}/${P}"
+inherit eutils
 
+IUSE=""
 DESCRIPTION="dockapp showing weather at geosynchronous orbit."
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ~mips hppa ppc ~sparc"
 
-DEPEND="virtual/glibc
-	sys-devel/perl
-	virtual/x11
-	x11-wm/WindowMaker"
-RDEPEND="${DEPEND}"
+DEPEND="dev-lang/perl
+		virtual/x11"
 
 src_compile() {
-
+	epatch ${FILESDIR}/getkp.patch
 	emake -C wmSpaceWeather clean || die "make clean failed"
 
 	COPTS=${CFLAGS} emake -C wmSpaceWeather \
 		|| die "parallel make failed"
-
 }
 
 src_install() {
-
 	dobin wmSpaceWeather/wmSpaceWeather wmSpaceWeather/GetKp
 	doman wmSpaceWeather/wmSpaceWeather.1
 	dodoc BUGS CHANGES HINTS README
-
 }
diff --git a/x11-plugins/wmSun/ChangeLog b/x11-plugins/wmSun/ChangeLog
index 80d2dbf17f73..8141a158b229 100644
--- a/x11-plugins/wmSun/ChangeLog
+++ b/x11-plugins/wmSun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmSun
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.1 2002/10/08 13:18:45 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmSun-1.03.ebuild:
+  Added ~sparc keyword.
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> wmSun-1.03.ebuild:
+  Added ~mips keyword.
 
 *wmSun-1.03 (08 Oct 2002)
 
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index e69de29bb2d1..93d13f726a74 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -0,0 +1,4 @@
+MD5 cb866a96a7e3a2d48ee86287e3a834c8 ChangeLog 541
+MD5 81d5db1baec254d12e92fca5ee6f231a metadata.xml 405
+MD5 a45725f0a44a410ffbcbdf88cd536f2f wmSun-1.03.ebuild 728
+MD5 9cbd119a00e53330151165668ca4660c files/digest-wmSun-1.03 61
diff --git a/x11-plugins/wmSun/metadata.xml b/x11-plugins/wmSun/metadata.xml
index b67ce899ca76..4b9687f7f8af 100644
--- a/x11-plugins/wmSun/metadata.xml
+++ b/x11-plugins/wmSun/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmSun/wmSun-1.03.ebuild b/x11-plugins/wmSun/wmSun-1.03.ebuild
index 0e8d5f736b0b..19d6e8690d04 100644
--- a/x11-plugins/wmSun/wmSun-1.03.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.03.ebuild
@@ -1,38 +1,26 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/wmSun-1.03.ebuild,v 1.1 2002/10/08 13:18:45 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/wmSun-1.03.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 IUSE=""
 
-S="${WORKDIR}/${P}"
-
 DESCRIPTION="dockapp which displays the rise/set time of the sun"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ~mips ppc ~sparc"
 
-DEPEND="virtual/glibc
-	virtual/x11
-	x11-wm/WindowMaker"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/x11"
 
 src_compile() {
-
 	emake -C wmSun clean || die "make clean failed"
-
 	COPTS=${CFLAGS} emake -C wmSun || die "parallel make failed"
-
 }
 
 src_install() {
-
 	dobin wmSun/wmSun
-
 	doman wmSun/wmSun.1
-
 	dodoc BUGS TODO wmSun/README
-
 }
diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index a207ca4bd61c..40e5474fe854 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for x11-plugins/wmacpi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.1 2002/11/22 22:21:02 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmacpi-2.1_rc1.ebuild:
+  Stable for x86.
+
+*wmacpi-2.1_rc1 (25 Jan 2005)
+
+  25 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmacpi-2.1_rc1.ebuild:
+  Version bump, plus patch that adds support for windowed mode.
+  Closes #76885, submitted (and patches provided) by Jochen Eisinger
+  <jochen.eisinger@gmx.de>
+  wmacpi-1.34.ebuild, wmacpi-1.99_p7.ebuild:
+  Update copyright headers...
+
+  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> wmacpi-1.34.ebuild,
+  wmacpi-1.99_p7.ebuild:
+  Keyworded -sparc... no ACPI, move along
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmacpi-1.99_p7.ebuild:
+  Stable on amd64.
+
+*wmacpi-1.99_p7 (20 Aug 2004)
+
+  20 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpi-1.99_p7.ebuild:
+  Version bump. Add DEPEND on x11-libs/libdockapp, change acpi and acpi.1
+  names to acpi-batt-status and acpi-batt-status.1 to fix #60685.
+  Marking it stable for x86.
+  wmacpi-1.99_p6.ebuild, files/digest-wmacpi-1.99_p6:
+  Remove older version...
+
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>:
+  No more apm support, therefore -ppc
+
+*wmacpi-1.99_p6 (13 Aug 2004)
+
+  13 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpi-1.99_p6.ebuild:
+  Version bump. This version only supports acpi, so all apm related
+  stuff was removed from ebuild... Closes #60237.
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmacpi-1.34.ebuild:
+  QA - fix use invocation
+
+*wmacpi-1.34 (23 Feb 2003)
+
+  04 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patches to remove apm/acpi parts ... this way only support for
+  one is include at a time #27685.
+
+  25 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Unmasked because older version is broke with newer kernels #22973.
+
+  23 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump for #15967.
 
 *wmacpi-1.21 (22 Nov 2002)
 
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index e69de29bb2d1..7b336816cf43 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -0,0 +1,12 @@
+MD5 e74f19ab68ac22ac3ff8c7b2eeb76a72 wmacpi-1.99_p7.ebuild 863
+MD5 ca080e792adfe63f79517fad382a6ca5 wmacpi-1.34.ebuild 950
+MD5 6e19d7f0dc112ed9ce422c8b88b192fc wmacpi-2.1_rc1.ebuild 988
+MD5 5b738a88b8852b67eaeaeb76b3071b80 ChangeLog 2202
+MD5 4719e916cabe20df559a3e88d5f4722a metadata.xml 250
+MD5 700b8b4a46daa2ccab0929b285f36019 files/2.1rc1-windowed.patch 918
+MD5 551fb5d3e01599cf89e3670d19000ff8 files/digest-wmacpi-2.1_rc1 65
+MD5 965b453bc3b6385a827d50c8cc05af3f files/digest-wmacpi-1.34 62
+MD5 419ea648d99ea0f0f1ce6fe742df1cab files/1.34-apm.patch 466
+MD5 e5a0e14c3f7c1b1fd21560657bb64e88 files/1.34-acpi.patch 469
+MD5 a4e62d6f61f4a5d669dadf8d1a604c04 files/2.1rc1-nodeps.patch 544
+MD5 3ced18da6e5bf0b6a8113eb56cb0f0cb files/digest-wmacpi-1.99_p7 65
diff --git a/x11-plugins/wmacpi/metadata.xml b/x11-plugins/wmacpi/metadata.xml
index 60f8eb1af127..f1e1deaf8395 100644
--- a/x11-plugins/wmacpi/metadata.xml
+++ b/x11-plugins/wmacpi/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
index 22ff68d95755..db772181c7e8 100644
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.34.ebuild,v 1.1 2003/02/23 21:39:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.34.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
+inherit eutils
+
+IUSE="acpi apm"
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+SLOT="0"
+KEYWORDS="x86 -sparc amd64 ppc"
 
 DEPEND="virtual/x11"
 
-src_compile() {
-	use apm && use acpi && eerror "APM and ACPI is in USE ... defaulting to ACPI"
-	use apm || use acpi || eerror "Neither APM or ACPI is in USE ... defaulting to ACPI"
-	if [ `use acpi` ] ; then
-		export CFLAGS="${CFLAGS} -DACPI"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use apm && use acpi && eerror "APM and ACPI are in USE ... defaulting to ACPI"
+	use apm || use acpi || eerror "Neither APM or ACPI are in USE ... defaulting to ACPI"
+	if use acpi || ! use apm ; then
+		epatch ${FILESDIR}/${PV}-acpi.patch
 	else
-		export CFLAGS="${CFLAGS} -DAPM"
+		epatch ${FILESDIR}/${PV}-apm.patch
 	fi
-	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_compile() {
+	emake OPT="${CFLAGS}" || die
 }
 
 src_install() {
diff --git a/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild b/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
index 6b2a8b63e532..cd9f2830fbb9 100644
--- a/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild,v 1.1 2004/08/20 03:01:35 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
@@ -12,7 +12,7 @@ SRC_URI="http://himi.org/wmacpi-ng/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 -sparc amd64 -ppc"
 
 DEPEND="virtual/x11
 	>=x11-libs/libdockapp-0.4.0-r1"
diff --git a/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
index 748f74b268be..3d5246d40784 100644
--- a/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild,v 1.1 2005/01/25 09:32:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://himi.org/wmacpi/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -sparc ~amd64 -ppc"
+KEYWORDS="x86 -sparc ~amd64 -ppc"
 
 DEPEND="virtual/x11
 	>=x11-libs/libdockapp-0.5.0"
diff --git a/x11-plugins/wmacpiload-ac/ChangeLog b/x11-plugins/wmacpiload-ac/ChangeLog
index 6a8e5531b720..c6c676a50b6b 100644
--- a/x11-plugins/wmacpiload-ac/ChangeLog
+++ b/x11-plugins/wmacpiload-ac/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-plugins/wmacpiload-ac
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.1 2004/07/30 01:04:40 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
+
+  01 Oct 2005; Daniel Goller <morfic@gentoo.org>
+  wmacpiload-ac-0.1.2_p3.ebuild:
+  Adding ~amd64 since it works
+
+  25 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  wmacpiload-ac-0.1.2_p3.ebuild:
+  #100255: changed homepage
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpiload-ac-0.1.2_p3.ebuild:
+  Stable for x86.
 
 *wmacpiload-ac-0.1.2_p3 (30 Jul 2004)
 
diff --git a/x11-plugins/wmacpiload-ac/Manifest b/x11-plugins/wmacpiload-ac/Manifest
index 09163986fbe6..6c0cebac50f0 100644
--- a/x11-plugins/wmacpiload-ac/Manifest
+++ b/x11-plugins/wmacpiload-ac/Manifest
@@ -1,2 +1,4 @@
-MD5 f9a6097db5b93a9456cc337f34a107a0 wmacpiload-ac-0.1.2_p3.ebuild 696
+MD5 40ec515b43e9deb5beace50f337eabfc ChangeLog 731
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 87532001d1510b1e1df3eb6971733409 wmacpiload-ac-0.1.2_p3.ebuild 898
 MD5 ae494fc4b8b5d8aecd2bfc5da1063fff files/digest-wmacpiload-ac-0.1.2_p3 72
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
index 447642bacd73..a78b21c61713 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.1 2004/07/30 01:04:40 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 MY_P="wmacpiload-0.1.2-ac3"
 
 IUSE=""
 DESCRIPTION="Hacked version of WMACPILoad, a dockapp to monitor CPU temp and battery time on ACPI kernels."
-HOMEPAGE="http://perso.wanadoo.fr/acarriou/wmacpiload/index.html"
+HOMEPAGE="http://wmacpiload.tuxfamily.org/"
 SRC_URI="http://perso.wanadoo.fr/acarriou/wmacpiload/${MY_P}.tar.bz2"
 
+# it has a new homepage, but the src_uri is still from the old one. change this
+# at the next version bump
+
 DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/x11-plugins/wmacpimon/ChangeLog b/x11-plugins/wmacpimon/ChangeLog
index ec7cc6b41c8c..63fb79e8dba7 100644
--- a/x11-plugins/wmacpimon/ChangeLog
+++ b/x11-plugins/wmacpimon/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for x11-plugins/wmacpimon
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.1 2004/07/08 12:33:43 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmacpimon-0.2.1.ebuild:
+  Wiped out INSTALL from dodoc.
 
 *wmacpimon-0.2.1 (08 Jul 2004)
 
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpimon-0.2.1.ebuild:
+  Stable for x86.
+
   08 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmacpimon-0.2.1.ebuild:
   Initial import.
diff --git a/x11-plugins/wmacpimon/Manifest b/x11-plugins/wmacpimon/Manifest
index b19b4da59f01..48c303c9e1c7 100644
--- a/x11-plugins/wmacpimon/Manifest
+++ b/x11-plugins/wmacpimon/Manifest
@@ -1,5 +1,5 @@
-MD5 204751753c7c54a5af4def4291ad80b8 wmacpimon-0.2.1.ebuild 1173
-MD5 7076aac96a81fc7175e6d1e225577357 ChangeLog 248
+MD5 9882ac8a3cef3fb607665d265bb343c1 wmacpimon-0.2.1.ebuild 1269
+MD5 350c63640c82a8db6121a3ad7cf4dba7 ChangeLog 544
 MD5 e0610fd0e64292e0ea4a9c297dc47d65 metadata.xml 404
 MD5 b6e42cf0c97a55a676c4b711c24f3779 files/wmacpimon.initscript 406
 MD5 ea6be2a74e2041eff879cc7239852aa3 files/digest-wmacpimon-0.2.1 66
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index b1806e751955..f3f977ab0f2c 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.1 2004/07/08 12:33:43 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/x11"
 
@@ -37,7 +37,7 @@ src_compile()
 src_install()
 {
 	dobin wmacpimond wmacpimon
-	dodoc AUTHORS ChangeLog README INSTALL
+	dodoc AUTHORS ChangeLog README
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/wmacpimon.initscript wmacpimon
 }
diff --git a/x11-plugins/wmail/ChangeLog b/x11-plugins/wmail/ChangeLog
index f1b8f320e2da..d36b9db53fea 100644
--- a/x11-plugins/wmail/ChangeLog
+++ b/x11-plugins/wmail/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for x11-plugins/wmail
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmail/ChangeLog,v 1.1 2002/10/08 13:00:35 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmail/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+*wmail-2.0-r2 (26 Aug 2005)
+
+  26 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmail-2.0-r2.ebuild:
+  Revision bump, directly as stable, updating libdockapp dependancy. Closes bug #105530.
+
+  28 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> -wmail-2.0.ebuild:
+  clean old broken ebuild
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> wmail-2.0-r1.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmail-2.0-r1.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmail-2.0-r1.ebuild, wmail-2.0.ebuild:
+  Masked wmail-2.0.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmail-2.0-r1.ebuild:
+  Masked wmail-2.0-r1.ebuild stable for ppc
+
+  31 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmail-2.0-r1.ebuild:
+  Stable for x86 as x11-plugins/libdockapp-0.5.0 is now stable as well.
+  wmail-2.0.ebuild:
+  Change libdockapp dependency to =x11-libs/libdockapp-0.4.0-r1 as
+  newer versions don't work with this package.
+
+*wmail-2.0-r1 (31 Aug 2004)
+
+  31 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmail-2.0-r1.ebuild:
+  Revision bump, adding support for libdockapp 0.5, see #54580.
+  Change HOMEPAGE to the www.dockapps.org entry, as the 'official' one
+  gives a 404...
+  metadata.xml:
+  Fix herd and longdescription...
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> wmail-2.0.ebuild:
+  Added to ~ppc.
 
 *wmail-2.0 (08 Oct 2002)
 
diff --git a/x11-plugins/wmail/Manifest b/x11-plugins/wmail/Manifest
index e69de29bb2d1..3383e255ae6f 100644
--- a/x11-plugins/wmail/Manifest
+++ b/x11-plugins/wmail/Manifest
@@ -0,0 +1,5 @@
+MD5 9a1a49652ec8f12bc0e8a174f70438bd wmail-2.0-r2.ebuild 827
+MD5 084d595c372377beda1b2d4897f6d32f ChangeLog 1751
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 b6c8bf6a379ca8145d6c8b30885f9ad8 files/wmail-2.0.support-libdockapp-0.5.0.patch 1026
+MD5 04660762fd41fa57a0bac2d55056514b files/digest-wmail-2.0-r2 60
diff --git a/x11-plugins/wmail/metadata.xml b/x11-plugins/wmail/metadata.xml
index be3643b04850..b1a9efc4f2f0 100644
--- a/x11-plugins/wmail/metadata.xml
+++ b/x11-plugins/wmail/metadata.xml
@@ -1,15 +1,5 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<longdescription>
-WebUMake Mail allows for Web-based e-mail with a
-simple browser interface and a secure,
-administered environment. It supports unlimited
-addresses for multiple domains using just a single
-catchall POP account, and can be integrated with
-WebUMake Web.
-</longdescription>
+<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/wmail/wmail-2.0-r2.ebuild b/x11-plugins/wmail/wmail-2.0-r2.ebuild
index ef8ebc2aab00..4aca3109c2b3 100644
--- a/x11-plugins/wmail/wmail-2.0-r2.ebuild
+++ b/x11-plugins/wmail/wmail-2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmail/wmail-2.0-r2.ebuild,v 1.1 2005/09/26 10:33:03 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmail/wmail-2.0-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/x11-plugins/wmalbum/ChangeLog b/x11-plugins/wmalbum/ChangeLog
index 56937c9f64be..9e8889643791 100644
--- a/x11-plugins/wmalbum/ChangeLog
+++ b/x11-plugins/wmalbum/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmalbum
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalbum/ChangeLog,v 1.1 2004/04/12 19:52:10 pyrania Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalbum/ChangeLog,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmalbum-0.1.5.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  02 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmalbum-0.1.5.ebuild:
+  Stable for x86.
+
+  13 Apr 2004; David Holm <dholm@gentoo.org> wmalbum-0.1.5.ebuild:
+  Added to ~ppc.
 
 *wmalbum-0.1.5 (12 Apr 2004)
 
diff --git a/x11-plugins/wmalbum/Manifest b/x11-plugins/wmalbum/Manifest
index 02dace6a2ac7..c95d6b903521 100644
--- a/x11-plugins/wmalbum/Manifest
+++ b/x11-plugins/wmalbum/Manifest
@@ -1,2 +1,4 @@
-MD5 a325f7b7afd2410467d8f6043c0558a3 wmalbum-0.1.5.ebuild 557
+MD5 339a363b8e77950386fdaa22db1bbd63 wmalbum-0.1.5.ebuild 659
+MD5 0fa1959449255d6e445060d71df254aa ChangeLog 662
+MD5 735b5e02c0da8442805415472f86ac04 metadata.xml 595
 MD5 81625e5e35db10ed1928fdc12006d593 files/digest-wmalbum-0.1.5 65
diff --git a/x11-plugins/wmalbum/wmalbum-0.1.5.ebuild b/x11-plugins/wmalbum/wmalbum-0.1.5.ebuild
index 492f2a4eac73..112df8e55d05 100644
--- a/x11-plugins/wmalbum/wmalbum-0.1.5.ebuild
+++ b/x11-plugins/wmalbum/wmalbum-0.1.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalbum/wmalbum-0.1.5.ebuild,v 1.1 2004/04/12 19:52:10 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalbum/wmalbum-0.1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
 DESCRIPTION="WMAlbum is a dock applet that displays album covers for songs being played by XMMS."
 HOMEPAGE="http://wmalbum.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmalbum/wmalbum-0.1.5.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE=""
 RDEPEND="media-sound/xmms"
 DEPEND="virtual/x11
@@ -15,7 +15,7 @@ DEPEND="virtual/x11
 
 src_install() {
 	einstall
-	dodoc AUTHORS COPYING INSTALL NEWS README TODO THANKS 
+	dodoc AUTHORS NEWS README TODO THANKS
 	insinto /usr/share/doc/${PF}
 	doins wmalbum
 }
diff --git a/x11-plugins/wmalms/ChangeLog b/x11-plugins/wmalms/ChangeLog
index 6533e20163ac..a1f59a014592 100644
--- a/x11-plugins/wmalms/ChangeLog
+++ b/x11-plugins/wmalms/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for x11-plugins/wmalms
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> wmalms-1.0.0a-r1.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> wmalms-1.0.0a-r1.ebuild:
+  Masked on sparc as lm_sensors doesn't work.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmalms-1.0.0a-r1 (6 Jun 2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmalms/Manifest b/x11-plugins/wmalms/Manifest
index e69de29bb2d1..8b88d030417c 100644
--- a/x11-plugins/wmalms/Manifest
+++ b/x11-plugins/wmalms/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 92f846a70e725e0d6300abcfc29dc0fa wmalms-1.0.0a-r1.ebuild 620
+MD5 2a3a1bb14cf003bbf85f9f326946b9fd ChangeLog 990
+MD5 4a8b114a7b2019f49c56121738175426 metadata.xml 765
+MD5 79e244e4053a0acf59ba92689d5a38ac files/digest-wmalms-1.0.0a-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCIeIpI1lqEGTUzyQRAuvjAKCnC0jsI94Cxz8PDOe+qsm2FQNjBACgtLq/
+d6aezjNG/OiZXKVHP5qPm0Q=
+=RzNK
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmalms/metadata.xml b/x11-plugins/wmalms/metadata.xml
index 8a9aed935ad8..5ebfc73f5163 100644
--- a/x11-plugins/wmalms/metadata.xml
+++ b/x11-plugins/wmalms/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
index 47821dd65ed6..e4fe70c89892 100644
--- a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
+++ b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2002, Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="wmalms X-windows hardware sensors applet"
 HOMEPAGE="http://www.geocities.com/wmalms"
 SRC_URI="http://www.geocities.com/wmalms/wmalms-1.0.0a.tar.gz"
@@ -12,7 +12,7 @@ DEPEND="virtual/x11
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 -sparc amd64"
 
 src_compile() {
 	econf || die
diff --git a/x11-plugins/wmapm/ChangeLog b/x11-plugins/wmapm/ChangeLog
index 8b4257e716d0..44f695d00255 100644
--- a/x11-plugins/wmapm/ChangeLog
+++ b/x11-plugins/wmapm/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/wmapm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> wmapm-3.1-r1.ebuild:
+  Fixed dodoc not to install COPYING and INSTALL.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*wmapm-3.1-r1 (03 Nov 2002)
+
+  03 Nov 2002; Seemant Kulleen <seemant@gentoo.org> wmapm-3.1-r1.ebuild
+  files/digest-wmapm-3.1-r1 :
+
+  Made more FHS compliant, and installed documentation.
 
 *wmapm-3.1 (1 Feb 2002)
   
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
index e69de29bb2d1..f8aa0b971b0e 100644
--- a/x11-plugins/wmapm/Manifest
+++ b/x11-plugins/wmapm/Manifest
@@ -0,0 +1,6 @@
+MD5 867125244c8daa7c9bb7ab360c30cca6 ChangeLog 1148
+MD5 9ab1770653f3d1f164714a1862b98560 files/digest-wmapm-3.1 60
+MD5 9ab1770653f3d1f164714a1862b98560 files/digest-wmapm-3.1-r1 60
+MD5 3b259a5f363f33db91782a3a521d9d2f metadata.xml 490
+MD5 b6599084b9e476307c33094887de8d84 wmapm-3.1-r1.ebuild 643
+MD5 7a752ea45dcff7d445468d3f589a989c wmapm-3.1.ebuild 619
diff --git a/x11-plugins/wmapm/metadata.xml b/x11-plugins/wmapm/metadata.xml
index 55a04f27cae6..12bcc3616b41 100644
--- a/x11-plugins/wmapm/metadata.xml
+++ b/x11-plugins/wmapm/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
index 2f01875901a5..54a32da7490b 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/wmapm-3.1-r1.ebuild,v 1.1 2002/11/03 15:47:17 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/wmapm-3.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${P}/${PN}
 DESCRIPTION="WindowMaker DockApp: Battery/Power status monitor for laptops"
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
@@ -9,19 +10,15 @@ HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc amd64 ppc"
 
 DEPEND="virtual/x11"
 
-src_compile() {
-	emake || die
-}
-
 src_install () {
 	cd ${S}
 	dobin wmapm
 	doman wmapm.1
 
 	cd ..
-	dodoc BUGS CHANGES COPYING HINTS INSTALL README TODO
+	dodoc BUGS CHANGES HINTS README TODO
 }
diff --git a/x11-plugins/wmapm/wmapm-3.1.ebuild b/x11-plugins/wmapm/wmapm-3.1.ebuild
index e0e8ca41ebe2..09d7d7c5c79c 100644
--- a/x11-plugins/wmapm/wmapm-3.1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2002 Vitaly Kushneriuk
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/wmapm-3.1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/wmapm-3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
-S=${WORKDIR}/${P}/wmapm
+IUSE=""
 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="virtual/x11"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc amd64 ppc"
 
-KEYWORDS="x86 sparc sparc64"
+DEPEND="virtual/x11"
 
-src_compile() {
-	emake || die
-}
+S=${WORKDIR}/${P}/${PN}
 
-src_install () {
-	mkdir -p ${D}/usr/bin
-	mkdir -p ${D}/usr/man/man1
+src_install() {
+	dodir /usr/bin /usr/man/man1
 	make DESTDIR=${D}/usr install || die
 }
diff --git a/x11-plugins/wmapmload/ChangeLog b/x11-plugins/wmapmload/ChangeLog
index 096f82c6a761..285b848bd4e2 100644
--- a/x11-plugins/wmapmload/ChangeLog
+++ b/x11-plugins/wmapmload/ChangeLog
@@ -1,9 +1,29 @@
 # ChangeLog for x11-plugins/wmapmload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.1 2002/10/29 07:21:26 bcowan Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmapmload-0.3.3.ebuild:
+  Stable on amd64.
+
+*wmapmload-0.3.3 (04 Jul 2004)
+
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmapmload-0.3.3.ebuild:
+  Stable on x86.
+
+  04 Jul 2004; David Holm <dholm@gentoo.org> wmapmload-0.3.3.ebuild:
+  Added to ~ppc.
+
+  04 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmapmload-0.3.3.ebuild:
+  Version bump.
 
 *wmapmload-0.3.0 (29 Oct 2002)
 
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmapmload-0.3.0.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
+
+  12 Jun 2003; <msterret@gentoo.org> wmapmload-0.3.0.ebuild:
+  add Header
+
   29 Oct 2002; Brad Cowan <bcowan@gentoo.org> wmapmload-0.3.0.ebuild,
   ChangeLog, files/digest-wmapmload-0.3.0 :
   
diff --git a/x11-plugins/wmapmload/Manifest b/x11-plugins/wmapmload/Manifest
index e69de29bb2d1..fe193193d2b4 100644
--- a/x11-plugins/wmapmload/Manifest
+++ b/x11-plugins/wmapmload/Manifest
@@ -0,0 +1,6 @@
+MD5 c3229e3e38a2b1371b57cb1bb8411972 ChangeLog 1018
+MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
+MD5 62a518df0d81bed1c83a187a5f6c8f69 wmapmload-0.3.0.ebuild 641
+MD5 71b06a7ddbc786756ae3e58654afb1de wmapmload-0.3.3.ebuild 646
+MD5 f6a62952616e4d493632024405d9515e files/digest-wmapmload-0.3.0 66
+MD5 2f657b8eb2b54ee6ee737d46d74677c1 files/digest-wmapmload-0.3.3 66
diff --git a/x11-plugins/wmapmload/metadata.xml b/x11-plugins/wmapmload/metadata.xml
index 2e745d20d6d7..40838bc36783 100644
--- a/x11-plugins/wmapmload/metadata.xml
+++ b/x11-plugins/wmapmload/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
index 6e905b70c258..3b5f87c32485 100644
--- a/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
+++ b/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Ebuild by AutoBot (autobot@midsouth.rr.com)
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="dockapp that monitors your apm battery status."
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild
index 21f612ab5e1c..a860b02f948c 100644
--- a/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild
+++ b/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Ebuild by AutoBot (autobot@midsouth.rr.com)
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild,v 1.1 2004/07/03 22:05:03 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that monitors your apm battery status."
@@ -9,7 +8,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 LICENSE="GPL-2"
 
 DEPEND="virtual/x11"
diff --git a/x11-plugins/wmappkill/ChangeLog b/x11-plugins/wmappkill/ChangeLog
index ef90d4040e35..5e7553f95858 100644
--- a/x11-plugins/wmappkill/ChangeLog
+++ b/x11-plugins/wmappkill/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmappkill
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappkill/ChangeLog,v 1.1 2005/01/08 01:25:42 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappkill/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  06 Nov 2005; Luis Medinas <metalgod@gentoo.org> wmappkill-0.2.ebuild:
+  Added ~amd64 keyword. Bug #107125.
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmappkill-0.2.ebuild:
+  Stable for x86.
 
 *wmappkill-0.2 (08 Jan 2005)
 
diff --git a/x11-plugins/wmappkill/Manifest b/x11-plugins/wmappkill/Manifest
index 4cabb9ebf456..c72e8f87b85e 100644
--- a/x11-plugins/wmappkill/Manifest
+++ b/x11-plugins/wmappkill/Manifest
@@ -1,4 +1,14 @@
-MD5 edae351ddb7446f831df29504f4c1e01 ChangeLog 279
-MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 d9ececd05c7229425aac8e43044cc222 wmappkill-0.2.ebuild 782
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8e04066875e5fd51d27472a40c8004a8 ChangeLog 577
 MD5 86d043f15a8d271d1f2575355dcbdf12 files/digest-wmappkill-0.2 64
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 8488a721ad4ee0580b8104c356f03e8e wmappkill-0.2.ebuild 894
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDbXmEwUpWvClEHQoRAvLEAJ4nAF0bMRF+OWEZGLezgrpZxf5a2ACfYmAD
+R4Q/Fd3LcfMTX7ZkqCn7WsE=
+=peca
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmappkill/wmappkill-0.2.ebuild b/x11-plugins/wmappkill/wmappkill-0.2.ebuild
index 5a4356073a50..50f35f732f3a 100644
--- a/x11-plugins/wmappkill/wmappkill-0.2.ebuild
+++ b/x11-plugins/wmappkill/wmappkill-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappkill/wmappkill-0.2.ebuild,v 1.1 2005/01/08 01:25:42 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappkill/wmappkill-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 IUSE=""
 S=${WORKDIR}/wmAppKill-${PV}
@@ -9,7 +9,7 @@ SRC_URI="http://internettrash.com/users/beuz/${P}.tar.gz"
 HOMEPAGE="http://internettrash.com/users/beuz/wmappkill.html"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 x86"
 DEPEND="virtual/x11
 	=gnome-base/libgtop-1*
 	>=dev-util/pkgconfig-0.15.0
diff --git a/x11-plugins/wmappl/ChangeLog b/x11-plugins/wmappl/ChangeLog
index 1624d0f5a7d3..770a0334f643 100644
--- a/x11-plugins/wmappl/ChangeLog
+++ b/x11-plugins/wmappl/ChangeLog
@@ -1,8 +1,29 @@
-# ChangeLog for x11-misc/wmappl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# ChangeLog for x11-plugins/wmappl
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
-*wmappl-0.6 (7-Feb-2002)
+  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> wmappl-0.71.ebuild:
+  Stable on sparc
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmappl-0.71.ebuild:
+  Stable on amd64.
+
+  29 Sep 2004; <pyrania@gentoo.org> wmappl-0.71.ebuild:
+  Marked stable on x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmappl-0.71.ebuild:
+  Masked wmappl-0.71.ebuild stable for ppc
+
+*wmappl-0.71 (23 Aug 2004)
+
+  23 Aug 2004; Michele Noberasco <s4t4n@gentoo.org>; wmappl-0.71.ebuild:
+  Version bump. Closes #61307. Also adding missing digest file.
+  wmappl-0.6.ebuild:
+  Update HOMEPAGE and SRC_URI...
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*wmappl-0.6 (07 Feb 2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
diff --git a/x11-plugins/wmappl/Manifest b/x11-plugins/wmappl/Manifest
index e69de29bb2d1..39ac1e70025b 100644
--- a/x11-plugins/wmappl/Manifest
+++ b/x11-plugins/wmappl/Manifest
@@ -0,0 +1,6 @@
+MD5 4b02a494af2bc41a69bdc2e69564ba30 ChangeLog 1113
+MD5 0cdefdcc4ebef736b8b772a784fc98bb wmappl-0.6.ebuild 628
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 4c2d6049d3439e5551899708d5d8569d wmappl-0.71.ebuild 619
+MD5 b1bfea200d93b4e65c9b72a331cb6479 files/digest-wmappl-0.6 61
+MD5 163988dcd976c5d903e52cb87aaa5891 files/digest-wmappl-0.71 63
diff --git a/x11-plugins/wmappl/wmappl-0.6.ebuild b/x11-plugins/wmappl/wmappl-0.6.ebuild
index 51466b056ff9..567f6ddbb8e1 100644
--- a/x11-plugins/wmappl/wmappl-0.6.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.6.ebuild
@@ -1,17 +1,17 @@
-# Copyright (c) Vitaly Kushneriuk
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.6.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://wmappl.sourceforge.net/"
 
 DEPEND="virtual/x11"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc amd64 ppc"
 
 src_compile() {
 	emake || die
diff --git a/x11-plugins/wmappl/wmappl-0.71.ebuild b/x11-plugins/wmappl/wmappl-0.71.ebuild
index a74fd07d586e..e78868bc434d 100644
--- a/x11-plugins/wmappl/wmappl-0.71.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.71.ebuild,v 1.1 2004/08/23 19:52:19 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.71.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Simple application launcher for the Window Maker dock."
@@ -11,7 +11,7 @@ DEPEND="virtual/x11"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc amd64 ppc"
 
 src_compile() {
 	econf || die "Configuration failed"
diff --git a/x11-plugins/wmbatppc/ChangeLog b/x11-plugins/wmbatppc/ChangeLog
index d140bb0c9005..a3dc9c29befd 100644
--- a/x11-plugins/wmbatppc/ChangeLog
+++ b/x11-plugins/wmbatppc/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for x11-plugins/wmbatppc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatppc-2.4.ebuild:
+  OK, I should not be doing this since I own no ppc hardware, but I got
+  several reports that this is working nicely, so... stable for ppc.
+  wmbatppc-1.0-r1.ebuild:
+  Wipe out old ebuilds...
+
+*wmbatppc-2.4 (17 Jul 2004)
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatppc-2.4.ebuild:
+  Version bump. Closes #43256, reported by John Steele Scott.
+  wmbatppc-1.0-r1.ebuild:
+  Fix SLOT value. Fix DEPEND.
+
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> * :
+  Relocate this to x11-plugins, assign to the desktop-dock herd.
+
+  07 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  wmbatppc-1.0-r1.ebuild:
+  QA - IUSE fix
+
+  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 e69de29bb2d1..282cf9e65b8a 100644
--- a/x11-plugins/wmbatppc/Manifest
+++ b/x11-plugins/wmbatppc/Manifest
@@ -0,0 +1,5 @@
+MD5 7d3260944848b501b1ab304f7709f0d8 ChangeLog 1358
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 abc7e0687df54089480d45217043ec4c wmbatppc-2.4.ebuild 763
+MD5 926ec328cde6d69edb946e570c91b184 files/digest-wmbatppc-2.4 63
+MD5 ab273b424c9630cbfa1872a7058cdf53 files/wmbatppc-2.4-cflags.patch 410
diff --git a/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild b/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild
index 8799fc614b91..0e72ffeb350e 100644
--- a/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild
+++ b/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild,v 1.1 2004/07/17 19:11:59 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://titelou.free.fr/wmbatppc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~ppc"
+KEYWORDS="-* ppc"
 IUSE=""
 
 DEPEND="virtual/x11
diff --git a/x11-plugins/wmbatteries/ChangeLog b/x11-plugins/wmbatteries/ChangeLog
index 3d7423b34885..146e585324bf 100644
--- a/x11-plugins/wmbatteries/ChangeLog
+++ b/x11-plugins/wmbatteries/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbatteries
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.1 2004/07/17 00:46:55 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
+
+  06 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatteries-0.1.3.ebuild:
+  Stable for x86.
 
 *wmbatteries-0.1.3 (17 Jul 2004)
 
diff --git a/x11-plugins/wmbatteries/Manifest b/x11-plugins/wmbatteries/Manifest
index 62bc9b10f97a..ca7a5a47ed9c 100644
--- a/x11-plugins/wmbatteries/Manifest
+++ b/x11-plugins/wmbatteries/Manifest
@@ -1,2 +1,4 @@
-MD5 55cfab7d92a9e591619d334032c3f528 wmbatteries-0.1.3.ebuild 657
+MD5 f7574b08b4bcd3ef010eb9e2665180ba wmbatteries-0.1.3.ebuild 615
+MD5 a466aaa0ef17eaf98cecf6b1003540fc ChangeLog 488
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 042165a400fdf853e6179c9887268892 files/digest-wmbatteries-0.1.3 70
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
index 84d82552756c..083a6573db44 100644
--- a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.1 2004/07/17 00:46:55 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index c4056f6af945..2929eff99745 100644
--- a/x11-plugins/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,7 +1,58 @@
 # ChangeLog for x11-plugins/wmbattery
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmbattery-2.19-r1.ebuild:
+  Removed COPYING from doinstall.
+
+  18 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmbattery-1.2.1-r2.ebuild:
+  Remove older version.
+
+  16 Nov 2004; Michael Hanselmann <hansmi@gentoo.org>
+  wmbattery-2.19-r1.ebuild:
+  Added to ~ppc.
+
+  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  wmbattery-1.2.1-r2.ebuild, wmbattery-2.19-r1.ebuild:
+  Keyworded -sparc, no classic apm here
+
+  01 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmbattery-2.19-r1.ebuild:
+  Stable for x86.
+  wmbattery-2.19.ebuild, wmbattery-1.2.1-r1.ebuild:
+  Remove older ebuilds.
+
+*wmbattery-2.19-r1 (17 Jul 2004)
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbattery-2.19-r1.ebuild:
+  New revision, install man file in /usr/share/man/man1, let wmbattery know that
+  its pixmaps are installed in /usr/share/pixmaps/wmbattery, closing #39436.
+
+*wmbattery-1.2.1-r2 (17 Jul 2004)
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbattery-1.2.1-r2.ebuild:
+  New revision, install man file in /usr/share/man/man1, let wmbattery know that
+  its pixmaps are installed in /usr/share/pixmaps/wmbattery, closing #39436.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmbattery-2.19.ebuild:
+  Unmask on amd64.
+
+  15 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmbattery-2.19.ebuild:
+  Add amd64 keyword.
+
+  24 Jan 2004; Markus Nigbur <pyrania@gentoo.org> wmbattery-2.19.ebuild:
+  SRC_URI fix.
+
+*wmbattery-2.19 (06 Dec 2003)
+
+  06 Dec 2003; Ian Leitch <port001@gentoo.org> wmbattery-1.2.1-r1.ebuild,
+  wmbattery-2.19.ebuild:
+  Version bump. Fixed SRC_URI, new dep on apmd for 2.x, removed sparc and am64
+  from KEYWORDS and set ~x86 as we don't yet know the stability of this 2.x
+  release. Also changed both version to install pixmaps into /usr/share/pixmaps
+  instead of /usr/share/icons. #32596
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmbattery-1.2.1-r1 (7-Feb-2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org>  * :
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index e69de29bb2d1..84e682bc89b2 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -0,0 +1,4 @@
+MD5 1b780b2359a7a7ca5100698aae4e6b0d wmbattery-2.19-r1.ebuild 827
+MD5 f3ce4c465ccf06dc8564d2bfe4aab8cb ChangeLog 2503
+MD5 96467fd518228a7950cea6d046f812dc metadata.xml 510
+MD5 4a7cd817e096ff1bf23412612b22fa34 files/digest-wmbattery-2.19-r1 65
diff --git a/x11-plugins/wmbattery/metadata.xml b/x11-plugins/wmbattery/metadata.xml
index ecc9693cc023..f8f39db14814 100644
--- a/x11-plugins/wmbattery/metadata.xml
+++ b/x11-plugins/wmbattery/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
index c4f218e4ead3..7dd759761000 100644
--- a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.1 2004/07/16 23:09:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://kitenet.net/programs/wmbattery"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 amd64"
+KEYWORDS="x86 amd64 -sparc ~ppc"
 
 DEPEND="virtual/x11
 	sys-apps/apmd"
@@ -26,7 +26,7 @@ src_compile() {
 
 src_install () {
 	dobin wmbattery
-	dodoc README COPYING TODO
+	dodoc README TODO
 
 	mv wmbattery.1x wmbattery.1
 	doman wmbattery.1
diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
index 200af3610edd..7120e82ed0c4 100644
--- a/x11-plugins/wmbiff/ChangeLog
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -1,7 +1,71 @@
 # 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 $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmbiff-0.4.25-r1.ebuild:
+  Stable on ppc.
+
+  15 May 2005; Jason Wever <weeve@gentoo.org> wmbiff-0.4.25-r1.ebuild:
+  Stable on SPARC.
+
+  12 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmbiff-0.4.25-r1.ebuild:
+  Stable for x86.
+
+*wmbiff-0.4.25-r1 (10 May 2005)
+
+  10 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmbiff-0.4.25-r1.ebuild:
+  Revision bump, closes #85662.
+
+  26 Nov 2004; Jason Wever <weeve@gentoo.org> wmbiff-0.4.25.ebuild:
+  Stable on sparc.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmbiff-0.4.25.ebuild:
+  Stable on amd64.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmbiff-0.4.25.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmbiff-0.4.25.ebuild:
+  Masked wmbiff-0.4.25.ebuild stable for ppc
+
+*wmbiff-0.4.25 (25 Jul 2004)
+
+  25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbiff-0.4.25.ebuild:
+  Version bump, closes #57965. Update ebuild not to install the gnutls/libgcrypt
+  patch as the issue has been solved upstream. Also install a sample .wmbiffrc file.
+  wmbiff-0.4.15.ebuild, wmbiff-0.4.17.ebuild:
+  Wipe out old ebuilds.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> wmbiff-0.4.15.ebuild:
+  Add die following econf for bug 48950
+
+  19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmbiff-0.4.20.ebuild:
+  Inherit eutils.
+
+*wmbiff-0.4.20 (11 Feb 2004)
+
+  11 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> wmbiff-0.4.20.ebuild,
+  files/wmbiff-0.4.20-crypto-api-fix.patch:
+  Version bump; Added patch for new gnutls/libgcrypt (see bug #37745)
+
+*wmbiff-0.4.17 (18 Dec 2003)
+
+  18 Dec 2003; Patrick Kursawe <phosphan@gentoo.org> wmbiff-0.3.5.ebuild,
+  wmbiff-0.4.15.ebuild, wmbiff-0.4.17.ebuild:
+  Version bump, added crypt USE support (gcrypt/gnutls).
+
+  24 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> wmbiff-0.4.15.ebuild:
+  Stable for x86
+
+*wmbiff-0.4.15 (18 Jun 2003)
+
+  18 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> wmbiff-0.4.15.ebuild:
+  Version bump requested in bug 21273, behaves a bit nicer than the old version
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmbiff-0.3.5 (7-Feb-2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index e69de29bb2d1..cb3c417d64ed 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -0,0 +1,7 @@
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 33ca9cd9a8dd09a62f144466f8cf2d5c ChangeLog 2588
+MD5 8f7cc73ff9255104b8c20f346378870d wmbiff-0.4.25.ebuild 833
+MD5 690a922c91e1b9f419c44cb7a6f7f076 wmbiff-0.4.25-r1.ebuild 1022
+MD5 988ba1c28ca012c99a062db781ef997c files/wmbiff-0.4.25-crypto-api-fix.patch 646
+MD5 e84517c77095652edc87803d423092d1 files/digest-wmbiff-0.4.25-r1 65
+MD5 e84517c77095652edc87803d423092d1 files/digest-wmbiff-0.4.25 65
diff --git a/x11-plugins/wmbiff/metadata.xml b/x11-plugins/wmbiff/metadata.xml
index bce3a70882f8..b1a9efc4f2f0 100644
--- a/x11-plugins/wmbiff/metadata.xml
+++ b/x11-plugins/wmbiff/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>phosphan@gentoo.org</email>
-</maintainer>
+<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
index b4b6edb31706..7e66a31f3dda 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.1 2005/05/10 08:34:04 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="crypt"
 
 src_unpack()
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
index a6c6c03cbba4..b6456b44343e 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.1 2004/07/25 20:50:51 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
@@ -12,20 +12,9 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc amd64 ppc"
 IUSE="crypt"
 
-#This has been fixed upstream
-#src_unpack() {
-#	unpack ${A}
-#	cd ${S}
-#	if use crypt; then
-#		if has_version ">dev-libs/libgcrypt-1.1.12"; then
-#			epatch ${FILESDIR}/${P}-crypto-api-fix.patch
-#		fi
-#	fi
-#}
-
 src_compile() {
 	local myconf
 	if ! use crypt; then
diff --git a/x11-plugins/wmbinclock/ChangeLog b/x11-plugins/wmbinclock/ChangeLog
index 715a439e3041..6cb8ccd181bf 100644
--- a/x11-plugins/wmbinclock/ChangeLog
+++ b/x11-plugins/wmbinclock/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for x11-plugins/wmbinclock
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.1 2003/06/03 06:05:00 bcowan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmbinclock-0.3.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmbinclock-0.3.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmbinclock-0.3.ebuild:
+  Masked wmbinclock-0.3.ebuild stable for ppc
+
+  31 Aug 2004; Tom Gall <tgall@gentoo.org> wmbinclock-0.3.ebuild:
+  stable on ppc64, bug #61759
+
+*wmbinclock-0.3 (22 Jul 2004)
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbinclock-0.3.ebuild:
+  Version bump. Stable dor x86.
+  wmbinclock-0.1.ebuild:
+  Remove redundant RDEPEND. Stable for x86.
+
+  12 Jun 2003; <msterret@gentoo.org> wmbinclock-0.1.ebuild:
+  add Header
 
 *wmbinclock-0.1 (03 Jun 2003)
 
diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest
index 5db836f872cb..3ff18d9661e9 100644
--- a/x11-plugins/wmbinclock/Manifest
+++ b/x11-plugins/wmbinclock/Manifest
@@ -1,2 +1,6 @@
-MD5 b4968be9f4204a2dd540335988113236 wmbinclock-0.1.ebuild 598
+MD5 c8e27f94fef23355f182efa682e2ca27 ChangeLog 1065
+MD5 53691c52e10e81b98a81e18ab25152a0 metadata.xml 363
+MD5 ec06a7003b70164905abd295d17b8872 wmbinclock-0.1.ebuild 660
+MD5 68842844aa3f5bcafa6445523e3f8337 wmbinclock-0.3.ebuild 647
 MD5 aecd7a931fbeb8f3f4436b8e29ebf72b files/digest-wmbinclock-0.1 64
+MD5 27c20bbeb121805bd6c8704968b4d05e files/digest-wmbinclock-0.3 65
diff --git a/x11-plugins/wmbinclock/metadata.xml b/x11-plugins/wmbinclock/metadata.xml
index 34bec69a81e7..ffd5d7d54c45 100644
--- a/x11-plugins/wmbinclock/metadata.xml
+++ b/x11-plugins/wmbinclock/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild
index fdae464a0077..6d8c03035a95 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild
@@ -1,6 +1,6 @@
-
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 IUSE=""
 
@@ -11,18 +11,17 @@ SRC_URI="http://www.inxsoft.net/wmbinclock/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="freedist"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc"
 
 DEPEND="virtual/x11"
-RDEPEND="${DEPEND}"
 
 src_compile() {
-    myconf=""
-    emake CFLAGS="${CFLAGS}" || die
+	myconf=""
+	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
-    dodoc README
-    dodir /usr/bin
-    make DESTDIR=${D}/usr install || die
+	dodoc README
+	dodir /usr/bin
+	make DESTDIR=${D}/usr install || die
 }
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
index bb043699563b..26ffde84b15d 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild,v 1.1 2004/07/22 00:11:43 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.inxsoft.net/wmbinclock/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="freedist"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/wmbio/ChangeLog b/x11-plugins/wmbio/ChangeLog
index dbdb0a8c041c..8fed6860baf9 100644
--- a/x11-plugins/wmbio/ChangeLog
+++ b/x11-plugins/wmbio/ChangeLog
@@ -1,7 +1,35 @@
 # ChangeLog for x11-plugins/wmbio
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.1 2003/11/02 03:04:52 pyrania Exp $
+# Copyright 2001-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmbio-1.02.ebuild:
+  Added ~sparc keyword.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmbio-1.02.ebuild:
+  Stable for x86.
+  wmbio-1.01.ebuild:
+  Remove older ebuild...
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmbio-1.02.ebuild:
+  stable on ppc64, bug #62249
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmbio-1.02.ebuild:
+  Masked wmbio-1.02.ebuild stable for ppc
+
+*wmbio-1.02 (23 Aug 2004)
+
+  23 Aug 2004; Michele Noberasc <s4t4n@gentoo.org> wmbio-1.02.ebuild:
+  Version Bump. General ebuild cleanup. Closes #61309
+  wmbio-1.01.ebuild:
+  Fox HOMEPAGE and SRC_URI...
+
+  25 Jan 2004; Markus Nigbur <pyrania@gentoo.org> wmbio-1.01.ebuild:
+  Marked stable on x86.
+
+  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 e5639801b0f3..4152dc72a6a5 100644
--- a/x11-plugins/wmbio/Manifest
+++ b/x11-plugins/wmbio/Manifest
@@ -1,2 +1,5 @@
-MD5 dfe5778444b2b67c7ae5667af8e5c345 wmbio-1.01.ebuild 598
-MD5 c2544808b27c1597b05b975e7cb6ea96 files/digest-wmbio-1.01 61
+MD5 4d10ca3a8b958f762a06c5ce37811528 ChangeLog 1189
+MD5 4c5c351347637833b44c37c9c107a6b4 metadata.xml 439
+MD5 93a7afd02da825b26a9a501f041b61ac wmbio-1.02.ebuild 733
+MD5 899f53e66e6978985dc03d46a5002194 files/digest-wmbio-1.02 61
+MD5 b446e616b6e3d2bbd614a3d3bdb2c5d1 files/wmbio-Makefile.patch 371
diff --git a/x11-plugins/wmbio/metadata.xml b/x11-plugins/wmbio/metadata.xml
index b772b92e3f94..3563b2d13d07 100644
--- a/x11-plugins/wmbio/metadata.xml
+++ b/x11-plugins/wmbio/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index 45832de781d9..dc4dcf3d7ed8 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/wmbio-1.02.ebuild,v 1.1 2004/08/23 19:36:44 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/wmbio-1.02.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ppc64 ~sparc"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmblob/ChangeLog b/x11-plugins/wmblob/ChangeLog
index 45860ad7ff2e..fae04e048745 100644
--- a/x11-plugins/wmblob/ChangeLog
+++ b/x11-plugins/wmblob/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-plugins/wmblob
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/ChangeLog,v 1.1 2004/07/17 22:50:42 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  10 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  -files/gentoo-cflags.patch, +files/wmblob-configure-fixes.patch,
+  wmblob-1.0.1.ebuild:
+  #98534: ./configure can now find x11 in gentoo; patch thanks to basic
+  <basic@mozdev.org>
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmblob-1.0.1.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmblob-1.0.1.ebuild:
+  Masked wmblob-1.0.1.ebuild stable for ppc
+
+  28 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmblob-1.0.1.ebuild:
+  Stable for x86.
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmblob-1.0.1.ebuild:
+  Added to ~ppc.
 
 *wmblob-1.0.1 (18 Jul 2004)
 
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index 92d225217656..b42872802613 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,5 +1,16 @@
-MD5 2a5066fa33f08f7169a859b63644ea9e wmblob-1.0.1.ebuild 779
-MD5 87722bba1e1f9b4cdebd3b2f16052451 ChangeLog 456
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e75227b75c041d2702e88220ea7cbf18 ChangeLog 1002
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 e071f5107eeb98d3da0d49f18691b92b files/wmblob.desktop 170
+MD5 804eec037808059a562de3b3750c3167 wmblob-1.0.1.ebuild 1068
 MD5 18919b645c99104e0d245449a17f6507 files/digest-wmblob-1.0.1 65
+MD5 e071f5107eeb98d3da0d49f18691b92b files/wmblob.desktop 170
+MD5 00ea8a34d168a32d869970637704e9c7 files/wmblob-configure-fixes.patch 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0ZPgl5AvwDPiUowRAh6eAJ9QMjYobEIVcEOMhwdJPQveUiM1uQCg0i5f
+Hguoo/3I2182yr5+T0tm1Go=
+=dWUS
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmblob/wmblob-1.0.1.ebuild b/x11-plugins/wmblob/wmblob-1.0.1.ebuild
index 334b5ed57680..2fa613c96e9f 100644
--- a/x11-plugins/wmblob/wmblob-1.0.1.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/wmblob-1.0.1.ebuild,v 1.1 2004/07/17 22:50:42 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/wmblob-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 inherit eutils
 
@@ -17,13 +17,14 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~sparc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# We patch the ./configure script to make it honour Gentoo CFLAGS
-	epatch ${FILESDIR}/gentoo-cflags.patch
+	# We patch the ./configure script to make it honour Gentoo CFLAGS and the
+	# X11 location
+	epatch ${FILESDIR}/${PN}-configure-fixes.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/wmbluecpu/ChangeLog b/x11-plugins/wmbluecpu/ChangeLog
index 5293e898b28a..d75f428637b0 100644
--- a/x11-plugins/wmbluecpu/ChangeLog
+++ b/x11-plugins/wmbluecpu/ChangeLog
@@ -1,9 +1,41 @@
 # ChangeLog for x11-plugins/wmbluecpu
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/ChangeLog,v 1.1 2004/07/03 22:48:51 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  07 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> wmbluecpu-0.6.ebuild:
+  Removed INSTALL from dodoc.
+  wmbluecpu-0.4.ebuild:
+  Wiped out older release.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> wmbluecpu-0.6.ebuild:
+  Stable on ppc.
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmbluecpu-0.6.ebuild:
+  Stable for x86.
+
+*wmbluecpu-0.6 (16 May 2005)
+
+  16 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmbluecpu-0.6.ebuild:
+  Version bump, Closes bug #92581...
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmbluecpu-0.4.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmbluecpu-0.4.ebuild:
+  Masked wmbluecpu-0.4.ebuild stable for ppc
 
 *wmbluecpu-0.4 (04 Jul 2004)
 
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbluecpu-0.4.ebuild:
+  Stable for x86.
+
+  05 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbluecpu-0.4.ebuild:
+  Don't install COPYING.
+
+  04 Jul 2004; David Holm <dholm@gentoo.org> wmbluecpu-0.4.ebuild:
+  Added to ~ppc.
+
   04 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbluecpu-0.4.ebuild:
   Initial import.
 
diff --git a/x11-plugins/wmbluecpu/Manifest b/x11-plugins/wmbluecpu/Manifest
index 922ad755192a..606a40a39adc 100644
--- a/x11-plugins/wmbluecpu/Manifest
+++ b/x11-plugins/wmbluecpu/Manifest
@@ -1,2 +1,4 @@
-MD5 b40e1172144bf2b3e71d4c9f2096baf1 wmbluecpu-0.4.ebuild 492
-MD5 1513671a066fd5641485c38c12d75a8a files/digest-wmbluecpu-0.4 65
+MD5 61f3d07c9dce90996b5e53b41339470d wmbluecpu-0.6.ebuild 638
+MD5 badf3ae7b1de1bad426f8a16bf812276 ChangeLog 1325
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 2069f18aba8443c997c7a2adc513b549 files/digest-wmbluecpu-0.6 65
diff --git a/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild b/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild
index d82bb38f8df9..abcb37aa029f 100644
--- a/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild
+++ b/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild,v 1.1 2005/05/16 10:07:43 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://litestep.boo.pl/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="ppc ~sparc x86"
 
 DEPEND="virtual/x11"
 
@@ -23,5 +23,5 @@ src_install()
 {
 	dobin wmbluecpu
 	doman wmbluecpu.1
-	dodoc ChangeLog TODO INSTALL README THANKS AUTHORS
+	dodoc ChangeLog TODO README THANKS AUTHORS
 }
diff --git a/x11-plugins/wmbutton/ChangeLog b/x11-plugins/wmbutton/ChangeLog
index a7f578ea8430..90b31f3ec125 100644
--- a/x11-plugins/wmbutton/ChangeLog
+++ b/x11-plugins/wmbutton/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-plugins/wmbutton
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.1 2004/07/17 23:37:48 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  25 Sep 2005; Luis Medinas <metalgod@gentoo.org> wmbutton-0.5.ebuild:
+  Added ~amd64 keywords. Closes bug #107124
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmbutton-0.5.ebuild:
+  Added ~sparc keyword.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmbutton-0.5.ebuild:
+  Stable for x86...
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmbutton-0.5.ebuild:
+  Masked wmbutton-0.5.ebuild stable for ppc
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbutton-0.5.ebuild:
+  Remove redundant RDEPEND variable.
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmbutton-0.5.ebuild:
+  Added to ~ppc.
 
 *wmbutton-0.5 (18 Jul 2004)
 
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index a2d927d41e20..f1053e045f4e 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -1,8 +1,18 @@
-MD5 33db26ccd96157019999f259f63dd4e4 wmbutton-0.5.ebuild 975
-MD5 fd618fa423461f1cd9ef3322991d5775 ChangeLog 285
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a6e427d77df693bcabefe381b040c830 ChangeLog 1003
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 e9eed0598402a0b172d0ac6a4808b59a wmbutton-0.5.ebuild 929
 MD5 6255e9c88017586a8a3c19713f2b5129 files/digest-wmbutton-0.5 63
-MD5 76263f6d447775d0a50f3a42e9e8299e files/wmbutton-cflags.patch 483
 MD5 7d562ae9a457c07a11b6c6038769dc6f files/sample.wmbutton 659
 MD5 542aee10cbc05b839c1f6d09f98b6406 files/wmbutton-buttons.xpm 25003
+MD5 76263f6d447775d0a50f3a42e9e8299e files/wmbutton-cflags.patch 483
 MD5 1bbe314d935c36bdb0cc7e80141624c9 files/wmbutton.desktop 242
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDNuy5wUpWvClEHQoRArlPAJsF82GCePfmhkjq4qUa+lY/dwkHogCghwsz
+Jl1CnwU2W/w25MAZJ5pXqA4=
+=/lkC
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmbutton/wmbutton-0.5.ebuild b/x11-plugins/wmbutton/wmbutton-0.5.ebuild
index 823ad2063cf5..df728a0d8f5f 100644
--- a/x11-plugins/wmbutton/wmbutton-0.5.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/wmbutton-0.5.ebuild,v 1.1 2004/07/17 23:37:48 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/wmbutton-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 inherit eutils
 
@@ -11,11 +11,10 @@ SRC_URI="http://www.dockapps.org/download.php/id/454/${P}.tar.gz"
 HOMEPAGE="http://www.dockapps.org/file.php/id/241"
 
 DEPEND="virtual/x11"
-RDEPEND="${DEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmcalc/ChangeLog b/x11-plugins/wmcalc/ChangeLog
index 382ae9d4979c..9a041e631504 100644
--- a/x11-plugins/wmcalc/ChangeLog
+++ b/x11-plugins/wmcalc/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for x11-plugins/wmcalc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.1 2002/10/24 17:56:41 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmcalc-0.4.ebuild:
+  Removed COPYING from dodoc.
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmcalc-0.4.ebuild:
+  Added ~sparc keyword.
+
+  12 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmcalc-0.4.ebuild:
+  Changed HOMEPAGE to www.dockapps.org as the original one no longer
+  exists. Changed SRC_URI to point to the gentoo mirrors...
+  wmcalc-0.4.ebuild:
+  Removed older ebuild.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmcalc-0.4.ebuild:
+  Stable on amd64.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmcalc-0.4.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmcalc-0.4.ebuild:
+  stable on ppc64, bug #62250
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmcalc-0.4.ebuild:
+  Masked wmcalc-0.4.ebuild stable for ppc
+
+*wmcalc-0.4 (15 Aug 2004)
+
+  15 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmcalc-0.4.ebuild,
+  files/wmcalc-0.4-Makefile.patch:
+  Version bump. Add patch to honour Gentoo CFLAGS. Update HOMEPAGE
+  and SRC_URI. Closes #60366.
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmcalc-0.3.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
+
+  19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmcalc-0.3.ebuild:
+  Inherit eutils.
+
+  21 Jan 2004; Brandon Hale <tseng@gentoo.org> wmcalc-0.3.ebuild:
+  Fixing some seriously sloppy behavior in the ebuild, see bug 38885.
 
 *wmcalc-0.3 (24 Oct 2002)
 
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index e69de29bb2d1..4a6e501d6050 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -0,0 +1,6 @@
+MD5 95524725489eeec3699b187da9547413 wmcalc-0.4.ebuild 746
+MD5 c1456cfe25d3859c3b5b4e4e31ad29ea ChangeLog 1941
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 40195ab356ef3fd7ae5183096026fb98 files/digest-wmcalc-0.4 61
+MD5 cb4a94f1ebb3397806349e863d673280 files/wmcalc.man 4751
+MD5 3047ad515640b4bf2d408530eb9c0a0b files/wmcalc-0.4-Makefile.patch 493
diff --git a/x11-plugins/wmcalc/metadata.xml b/x11-plugins/wmcalc/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmcalc/metadata.xml
+++ b/x11-plugins/wmcalc/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
index 18a9d149f38e..a08379d86ed7 100644
--- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.1 2004/08/15 20:38:38 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="A WindowMaker DockApp calculator"
-HOMEPAGE="http://freakzone.net/gordon/#wmcalc"
-SRC_URI="http://freakzone.net/gordon/src/${P}.tar.gz"
+HOMEPAGE="http://dockapps.org/file.php/id/130"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 DEPEND="virtual/x11"
 
 IUSE=""
@@ -30,7 +30,7 @@ src_install ()
 {
 	dobin wmcalc
 
-	dodoc README COPYING
+	dodoc README
 
 	newman ${FILESDIR}/wmcalc.man wmcalc.1
 
diff --git a/x11-plugins/wmcalendar/ChangeLog b/x11-plugins/wmcalendar/ChangeLog
index a330a352723f..88691e9edca6 100644
--- a/x11-plugins/wmcalendar/ChangeLog
+++ b/x11-plugins/wmcalendar/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for x11-plugins/wmcalendar
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.1 2004/03/06 02:20:55 pyrania Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmcalendar-0.5.0.ebuild:
+  Removed INSTALL and COPYING from dodoc.
+
+  13 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> wmcalendar-0.5.0.ebuild:
+  Added some magic sed to remove unneeded SYSTEM variable from Makefile,
+  fixing bug #105730.
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmcalendar-0.5.0.ebuild:
+  Added ~sparc keyword.
+
+  23 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> metadata.xml:
+  Added missing metadata.xml file...
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmcalendar-0.5.0.ebuild:
+  Stable on x86.
+
+  20 Mar 2004; Markus Nigbur <pyrania@gentoo.org>
+  files/wmcalendar-0.5.0.makefile.patch:
+  Added Makefile patch. Closing bug #28951.
 
 *wmcalendar-0.5.0 (06 Mar 2004)
 
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index 3fc13b6f98fb..7c83f738e3b3 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,2 +1,5 @@
-MD5 42542975599142ac2a360bc8ba127cab wmcalendar-0.5.0.ebuild 973
+MD5 6f929f951ceb06f7c88ecfe929602cd0 wmcalendar-0.5.0.ebuild 1038
+MD5 b67f3e5505cbdd71f6f55ec69d0ab6e5 ChangeLog 1063
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 e1445dfb0ac0d0dd189f22956e61de10 files/digest-wmcalendar-0.5.0 67
+MD5 54f3e7d4eb228c47d0712426fff78d15 files/wmcalendar-0.5.0.makefile.patch 980
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild
index 2cb2d1bff080..16a9cc1ad960 100644
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild,v 1.1 2004/03/06 02:20:55 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
 inherit eutils
 
@@ -13,24 +13,32 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~sparc"
 
 DEPEND="virtual/x11
 			>=dev-libs/libical-0.24_rc4
 			>=dev-util/pkgconfig-0.15.0
-			>=x11-libs/gtk+-2.2.1-r1"
+			>=x11-libs/gtk+-2.2.1-r1
+			>=sys-apps/sed-4.0.9"
 
-# default Makefile overwrites CC and CFAGS variables so we patch it
-src_unpack() {
+S=${WORKDIR}/${P}/Src
+
+src_unpack()
+{
 	unpack ${A}
 	cd ${WORKDIR}
+
+	# default Makefile overwrites CC and CFLAGS variables so we patch it
 	epatch ${FILESDIR}/${P}.makefile.patch
-}
 
-S=${WORKDIR}/${P}/Src
+	# remove unneeded SYSTEM variable from Makefile, fixing bug #105730
+	cd ${S}
+	sed -i -e "s:\$(SYSTEM)::" Makefile
+}
 
-src_install() {
+src_install()
+{
 	dodir /usr/bin /usr/man/man1
 	make DESTDIR=${D}/usr install || die
-	cd .. && dodoc BUGS CHANGES COPYING HINTS INSTALL README TODO || die
+	cd .. && dodoc BUGS CHANGES HINTS README TODO || die
 }
diff --git a/x11-plugins/wmcdplay/ChangeLog b/x11-plugins/wmcdplay/ChangeLog
index 53f601c84450..eb2d5ccb7cb4 100644
--- a/x11-plugins/wmcdplay/ChangeLog
+++ b/x11-plugins/wmcdplay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmcdplay
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/ChangeLog,v 1.1 2004/07/17 22:07:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmcdplay-1.0_beta1.ebuild:
+  Stable for x86.
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmcdplay-1.0_beta1.ebuild:
+  Added to ~ppc.
 
 *wmcdplay-1.0_beta1 (17 Jul 2004)
 
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
index 1b3a35592045..950374464ee6 100644
--- a/x11-plugins/wmcdplay/Manifest
+++ b/x11-plugins/wmcdplay/Manifest
@@ -1,4 +1,6 @@
-MD5 74e6b544056fa08f2165871ebacee82d wmcdplay-1.0_beta1.ebuild 1171
+MD5 5d50d88dd7fa5ba93e5ba05a042f09fe ChangeLog 576
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 f94a1221cdf6ceca5d6e2bc3cf6031a4 wmcdplay-1.0_beta1.ebuild 1087
 MD5 2f2d993a02097075b5b2333355b73b64 files/wmcdplay.desktop 190
 MD5 ba46f3fbf16e0de2a9bdb11a98425ad2 files/wmcdplay-ComplexProgramTargetNoMan.patch 212
 MD5 8d00afd6e6d07d13fbdc339b31ffb972 files/wmcdplay-xpmdir.patch 271
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
index 56f4675d116e..4ebddb25b982 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild,v 1.1 2004/07/17 22:07:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmcliphist/ChangeLog b/x11-plugins/wmcliphist/ChangeLog
index a89fa2223a20..625f6814c2b0 100644
--- a/x11-plugins/wmcliphist/ChangeLog
+++ b/x11-plugins/wmcliphist/ChangeLog
@@ -1,6 +1,16 @@
 # 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 $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  20 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmcliphist-0.5.ebuild:
+  Fix ebuild to make it produce a working binary. Closes #56782.
+  wmcliphist-0.5.ebuild:
+  Remove old ebuilds.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> wmcliphist-0.5.ebuild:
+  Added ~sparc keyword.
+
+*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 4e77d034a9bf..d3a145ca09ca 100644
--- a/x11-plugins/wmcliphist/Manifest
+++ b/x11-plugins/wmcliphist/Manifest
@@ -1,3 +1,5 @@
-MD5 0357cf92a14cf180835589fafc41913b wmcliphist-0.3.ebuild 499
-MD5 4caf75c210d03969266a118f8eed864e ChangeLog 265
-MD5 c9cd56c59caa2c634d3235c132cbf22c files/digest-wmcliphist-0.3 65
+MD5 e36b715410c94481643ae6e7c035c719 wmcliphist-0.5.ebuild 878
+MD5 d1b43aff681b1be7e333d06d5f7378a9 ChangeLog 663
+MD5 f2cbce9d14d9c423f188ceb31843a4e0 metadata.xml 460
+MD5 62a2e0b91ee16cb9c846cbede284543f files/wmcliphist-cflags.patch 309
+MD5 1d625b26af8f38aca33fbc9c0da0c0f8 files/digest-wmcliphist-0.5 65
diff --git a/x11-plugins/wmcliphist/metadata.xml b/x11-plugins/wmcliphist/metadata.xml
index b4ceb74e5953..a804b5173da7 100644
--- a/x11-plugins/wmcliphist/metadata.xml
+++ b/x11-plugins/wmcliphist/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmcliphist/wmcliphist-0.5.ebuild b/x11-plugins/wmcliphist/wmcliphist-0.5.ebuild
index 42485704fad2..7d408c8be1b6 100644
--- a/x11-plugins/wmcliphist/wmcliphist-0.5.ebuild
+++ b/x11-plugins/wmcliphist/wmcliphist-0.5.ebuild
@@ -1,21 +1,35 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/wmcliphist-0.5.ebuild,v 1.1 2003/06/26 10:24:24 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/wmcliphist-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+inherit eutils
+
+IUSE=""
 DESCRIPTION="Dockable clipboard history application for Window Maker"
 HOMEPAGE="http://linux.nawebu.cz/wmcliphist/"
 SRC_URI="http://linux.nawebu.cz/wmcliphist/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ~sparc ppc"
 SLOT="0"
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
-src_compile() {
-	emake || die
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# We patch the Makefile as the original doesn't honour Gentoo CFLAGS
+	epatch ${FILESDIR}/wmcliphist-cflags.patch || die "Source patch failed."
+}
+
+src_compile()
+{
+	emake GENTOO_CFLAGS="${CFLAGS}" || die "Compilation failed."
 }
 
-src_install() {
+src_install()
+{
 	dobin wmcliphist
 	dodoc ChangeLog README
 	newdoc .wmcliphistrc wmcliphistrc.sample
diff --git a/x11-plugins/wmclock/ChangeLog b/x11-plugins/wmclock/ChangeLog
index 460cf756a38d..3b33756cdfa9 100644
--- a/x11-plugins/wmclock/ChangeLog
+++ b/x11-plugins/wmclock/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-plugins/wmclock
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclock/ChangeLog,v 1.1 2003/10/03 22:56:12 pyrania Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmclock-1.0.12.2.ebuild:
+  glibc -> libc
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> wmclock-1.0.12.2.ebuild:
+  Added ~sparc keyword.
+
+  27 Dec 2003; Markus Nigbur <pyrania@gentoo.org> wmclock-1.0.12.2.ebuild:
+  Removed windowmaker dependency and moved the binary to /usr/bin.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> wmclock-1.0.12.2.ebuild:
+  Make stable on ppc
+  Thanks to Florian Daniel for the testing
 
 *wmclock-1.0.12.2 (04 Oct 2003)
 
diff --git a/x11-plugins/wmclock/Manifest b/x11-plugins/wmclock/Manifest
index 30abf5c50ffb..929ba42fd00b 100644
--- a/x11-plugins/wmclock/Manifest
+++ b/x11-plugins/wmclock/Manifest
@@ -1,3 +1,4 @@
-MD5 7920ce39811339c15f3a9df378e24b90 wmclock-1.0.12.2.ebuild 818
-MD5 4ae73f8aa880961348ad38ea9974fe3c ChangeLog 295
+MD5 196d4b390903864a37ebb749183de96b wmclock-1.0.12.2.ebuild 783
+MD5 d66b41dbdb9d82403b276c52e99f2560 ChangeLog 847
+MD5 5bc2c3cf0f0bf1b54d84422e850b80f0 metadata.xml 604
 MD5 71bb55337d718b902292c82deef7b6f4 files/digest-wmclock-1.0.12.2 67
diff --git a/x11-plugins/wmclock/metadata.xml b/x11-plugins/wmclock/metadata.xml
index a4651b341e44..5515d0958711 100644
--- a/x11-plugins/wmclock/metadata.xml
+++ b/x11-plugins/wmclock/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild b/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild
index d2399e04fdd5..00ad7a11368b 100644
--- a/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild,v 1.1 2003/10/03 22:56:12 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclock/wmclock-1.0.12.2.ebuild,v 1.1.1.1 2005/11/30 10:10:51 chriswhite Exp $
 
 IUSE=""
 
@@ -9,12 +9,11 @@ SRC_URI="http://www.jmknoble.net/WindowMaker/wmclock/${P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/WindowMaker/wmclock/"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc ~sparc"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc
-	virtual/x11
-	x11-wm/windowmaker"
+DEPEND="virtual/libc
+	virtual/x11"
 
 src_compile() {
 	econf || die "configure failed"
@@ -23,7 +22,6 @@ src_compile() {
 }
 
 src_install () {
-	into /usr/X11R6
 	strip wmclock
 	dobin wmclock
 
diff --git a/x11-plugins/wmclockmon/ChangeLog b/x11-plugins/wmclockmon/ChangeLog
index 654af22d317c..f94b05e8b53d 100644
--- a/x11-plugins/wmclockmon/ChangeLog
+++ b/x11-plugins/wmclockmon/ChangeLog
@@ -1,12 +1,74 @@
 # ChangeLog for x11-plugins/wmclockmon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/ChangeLog,v 1.1 2002/10/29 07:07:37 bcowan Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  31 Aug 2004; Tom Gall <tgall@gentoo.org> wmclockmon-0.8.0.ebuild:
+  stable on ppc64, bug #61760
+
+  30 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmclockmon-0.8.0.ebuild:  
+  Stable on x86.
+
+*wmclockmon-0.8.0 (24 Jun 2004)
+
+  24 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmclockmon-0.8.0.ebuild:  
+  Version bump.
+  wmclockmon-0.7.2.ebuild: Stable on x86.
+  wmclockmon-0.3.0.ebuild, wmclockmon-0.4.0.ebuild, wmclockmon-0.5.0.ebuild:
+  Remove old versions...
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmclockmon-0.3.0.ebuild,
+  wmclockmon-0.4.0.ebuild, wmclockmon-0.5.0.ebuild, wmclockmon-0.7.2.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmclockmon-0.7.2.ebuild:
+  Stable on amd64.
+
+*wmclockmon-0.7.2 (13 Mar 2004)
+
+  13 Mar 2004; Markus Nigbur <pyrania@gentoo.org> wmclockmon-0.5.0.ebuild,
+  wmclockmon-0.7.2.ebuild:
+  Version bump. Closing bug #44573.
+
+*wmclockmon-0.5.0 (17 Nov 2003)
+
+  17 Nov 2003; Markus Nigbur <pyrania@gentoo.org> wmclockmon-0.1.3.ebuild,
+  wmclockmon-0.2.0.ebuild, wmclockmon-0.4.0.ebuild, wmclockmon-0.5.0.ebuild:
+  version bump
+
+*wmclockmon-0.4.0 (11 Oct 2003)
+
+  11 Oct 2003; Markus Nigbur <pyrania@gentoo.org> wmclockmon-0.4.0.ebuild:
+  Version bump. Thanks to Noberasco Michele (bug 30838)
+
+*wmclockmon-0.3.0 (27 Sep 2003)
+
+  27 Sep 2003; Markus Nigbur <pyrania@gentoo.org> wmclockmon-0.3.0.ebuild:
+  Bump (bug #29742).
+
+  25 Aug 2003; Jason Wever <weeve@gentoo.org> wmclockmon-0.2.0.ebuild:
+  Marked stable for sparc to fix bug #27311.
+
+  17 Aug 2003; Nick Hadaway <raker@gentoo.org> wmclockmon-0.2.0.ebuild:
+  Added gtk+ to DEPEND.  Cleaned up the ebuild and added docs.
+  All this prompted by bug #26833.  Thanks Eric. :)
+
+  12 Jun 2003; <msterret@gentoo.org> wmclockmon-0.1.3.ebuild,
+  wmclockmon-0.2.0.ebuild:
+  add Header
+
+*wmclockmon-0.2.0 (22 Dec 2002)
+
+  23 Dec 2002; Nick Hadaway <raker@gentoo.org> wmclockmon-0.2.0.ebuild :
+  Marked stable.
+
+  22 Dec 2002; Nick Hadaway <raker@gentoo.org> wmclockmon-0.2.0.ebuild,
+  files/digest-wmclockmon-0.2.0 :
+  Version bump.  Please comment on bug #11909.
 
 *wmclockmon-0.1.3 (29 Oct 2002)
 
   29 Oct 2002; Brad Cowan <bcowan@gentoo.org> wmclockmon-0.1.3.ebuild,
   ChangeLog, files/digest-wmclockmon-0.1.3 :
-  
   Initial import thanks to Autobot.
 
 
diff --git a/x11-plugins/wmclockmon/Manifest b/x11-plugins/wmclockmon/Manifest
index e69de29bb2d1..3a023d2dec67 100644
--- a/x11-plugins/wmclockmon/Manifest
+++ b/x11-plugins/wmclockmon/Manifest
@@ -0,0 +1,6 @@
+MD5 3db25dc3d5a7d85ab99ab77d11540f6c ChangeLog 2536
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 d0a61bdd7661b11178351a89de7f5682 wmclockmon-0.7.2.ebuild 712
+MD5 3fb0f9e4ccc5044c321ba1759191a97c wmclockmon-0.8.0.ebuild 715
+MD5 1a8155911e433721f18db54810c63a7c files/digest-wmclockmon-0.7.2 68
+MD5 b5113806e188f8e506b0e6c5b51100fd files/digest-wmclockmon-0.8.0 68
diff --git a/x11-plugins/wmclockmon/metadata.xml b/x11-plugins/wmclockmon/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmclockmon/metadata.xml
+++ b/x11-plugins/wmclockmon/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild
index 96b22ff12bca..6892cd9d8047 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild,v 1.1 2004/03/13 22:47:49 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
 IUSE=""
 
@@ -9,10 +9,10 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 ~sparc amd64 ppc"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree
+DEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*"
 
 src_install () {
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.0.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.0.ebuild
index fecd650a541a..718795afaeec 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.0.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.8.0.ebuild,v 1.1 2004/06/24 12:51:17 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmclockmon/wmclockmon-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc amd64 ppc"
+KEYWORDS="x86 ~sparc amd64 ppc ppc64"
 LICENSE="GPL-2"
 
 DEPEND="virtual/x11
diff --git a/x11-plugins/wmcms/ChangeLog b/x11-plugins/wmcms/ChangeLog
index ec1fa7b06684..b2f8a2eb99b5 100644
--- a/x11-plugins/wmcms/ChangeLog
+++ b/x11-plugins/wmcms/ChangeLog
@@ -1,15 +1,40 @@
 # ChangeLog for x11-plugins/wmcms
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmcms-0.3.5-r1.ebuild:
+  Stable on amd64.
+
+  12 Sep 2004; Jason Wever <weeve@gentoo.org> wmcms-0.3.5-r1.ebuild:
+  Stable on sparc.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmcms-0.3.5-r1.ebuild:
+  stable on ppc64, bug #62251
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmcms-0.3.5-r1.ebuild:
+  Masked wmcms-0.3.5-r1.ebuild stable for ppc
+
+  31 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> : wmcms-0.3.5-r1.ebuild:
+  Stable for x86.
+
+*wmcms-0.3.5-r1 (20 Jul 2004)
+
+  20 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> : wmcms-0.3.5-r1.ebuild:
+  Revision bump, added patch to make it work seamlessly with both 2.4 and
+  2.6 kernels... Closes #40640.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmcms-0.3.5 (1 Feb 2002)
 
-  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+  Oct 18 2002; Nick Hadaway <raker@gentoo.org> wmcms-0.3.5.ebuild :
+  Added IUSE and updated dependancy from docklib to libdockapp.
 
+  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
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/x11-plugins/wmcms/Manifest b/x11-plugins/wmcms/Manifest
index e69de29bb2d1..9fc79d4bc10c 100644
--- a/x11-plugins/wmcms/Manifest
+++ b/x11-plugins/wmcms/Manifest
@@ -0,0 +1,7 @@
+MD5 2b580584a490d4ffeedeba4e150c0137 ChangeLog 1686
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 ffaab438b8dc05e0680c006e572d9c78 wmcms-0.3.5.ebuild 571
+MD5 1c2fee8861b5c223293bb3964ccb9d3b wmcms-0.3.5-r1.ebuild 736
+MD5 3d836ad986971d2cfdf3b9af4d1867f1 files/digest-wmcms-0.3.5 63
+MD5 3d836ad986971d2cfdf3b9af4d1867f1 files/digest-wmcms-0.3.5-r1 63
+MD5 89008bcc6679be353c11621157845cf5 files/wmcms-0.3.5-s4t4n.patch 8562
diff --git a/x11-plugins/wmcms/metadata.xml b/x11-plugins/wmcms/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmcms/metadata.xml
+++ b/x11-plugins/wmcms/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r1.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r1.ebuild
index 8dc78bebbea9..45038f6b61b4 100644
--- a/x11-plugins/wmcms/wmcms-0.3.5-r1.ebuild
+++ b/x11-plugins/wmcms/wmcms-0.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/wmcms-0.3.5-r1.ebuild,v 1.1 2004/07/20 20:56:18 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/wmcms-0.3.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc amd64 ppc ppc64"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmcms/wmcms-0.3.5.ebuild b/x11-plugins/wmcms/wmcms-0.3.5.ebuild
index 5d57f4cb251b..ab7ccd040598 100644
--- a/x11-plugins/wmcms/wmcms-0.3.5.ebuild
+++ b/x11-plugins/wmcms/wmcms-0.3.5.ebuild
@@ -1,17 +1,18 @@
-# Copyright (c) Vitaly Kushneriuk
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/wmcms-0.3.5.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcms/wmcms-0.3.5.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+IUSE=""
 
-S=${WORKDIR}/${P}
 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"
+DEPEND="x11-libs/libdockapp"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc amd64 ppc"
 
 src_compile() {
 	make || die
diff --git a/x11-plugins/wmcoincoin/ChangeLog b/x11-plugins/wmcoincoin/ChangeLog
index 1b446e05ca00..1129ac2c21f0 100644
--- a/x11-plugins/wmcoincoin/ChangeLog
+++ b/x11-plugins/wmcoincoin/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for x11-plugins/wmcoincoin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/ChangeLog,v 1.1 2002/10/04 19:00:55 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmcoincoin-2.5.0g.ebuild:
+  Stable on ppc.
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmcoincoin-2.5.0g.ebuild,
+  Stable for x86.
+  -wmcoincoin-2.5.0f.ebuild:
+  Wiped out older unstable version.
+
+*wmcoincoin-2.5.0g (25 Jun 2005)
+
+  25 Jun 2005; <pyrania@gentoo.org> wmcoincoin-2.5.0g.ebuild,
+  +wmcoincoin-2.5.0g.ebuild:
+  Version bump and fixed dependecy issues with imlib2.
+
+*wmcoincoin-2.5.0f (11 Apr 2005)
+
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmcoincoin-2.5.0f.ebuild:
+  Version bump, closes #88383.
+  wmcoincoin-2.5.0c.ebuild:
+  Updated copyright headers.
+  wmcoincoin-2.4.5b.ebuild:
+  Wiped out older version.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmcoincoin-2.5.0c.ebuild:
+  Stable on amd64.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmcoincoin-2.5.0c.ebuild:
+  Stable for x86...
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmcoincoin-2.5.0c.ebuild:
+  Masked wmcoincoin-2.5.0c.ebuild stable for ppc
+
+*wmcoincoin-2.5.0c (27 Jul 2004)
+
+  27 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmcoincoin-2.5.0c.ebuild:
+  Version bump.
+  wmcoincoin-2.4.5b.ebuild:
+  Stable for x86.
+  wmcoincoin-2.3.8b.ebuild:
+  Wipe out old ebuilds.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmcoincoin-2.3.8b.ebuild,
+  wmcoincoin-2.4.5b.ebuild:
+  glibc -> libc
+
+*wmcoincoin-2.4.5b (25 Jul 2003)
+
+  25 Jul 2003; Nick Hadaway <raker@gentoo.org> wmcoincoin-2.4.5b.ebuild:
+  Version bump.  Minor build cleanups.  Closes bug #25109.
 
 *wmcoincoin-2.3.8b (04 Oct 2002)
 
diff --git a/x11-plugins/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
index e69de29bb2d1..7056d3863d28 100644
--- a/x11-plugins/wmcoincoin/Manifest
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -0,0 +1,6 @@
+MD5 aef2844cbe4dc8112d53bc28ed102d40 wmcoincoin-2.5.0c.ebuild 680
+MD5 e4a9b2b5ea29ef2398fd620cd552a503 metadata.xml 467
+MD5 28bc1479e2aeb7d07c2a0de1f9fc4467 ChangeLog 1962
+MD5 1b6198cc5148bb55a36b390bfaaa3a85 wmcoincoin-2.5.0g.ebuild 700
+MD5 9bf4e6ba1074a8ae1475cc6a94bbb576 files/digest-wmcoincoin-2.5.0g 69
+MD5 62c64d1ecc7ca24c446002d7659f1b89 files/digest-wmcoincoin-2.5.0c 69
diff --git a/x11-plugins/wmcoincoin/metadata.xml b/x11-plugins/wmcoincoin/metadata.xml
index 1edc5d29e1dd..f05220f4caf4 100644
--- a/x11-plugins/wmcoincoin/metadata.xml
+++ b/x11-plugins/wmcoincoin/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.5.0c.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.5.0c.ebuild
index 7dc88986dd49..d9926a9bb0e9 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.5.0c.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.5.0c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/wmcoincoin-2.5.0c.ebuild,v 1.1 2004/07/27 08:27:55 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/wmcoincoin-2.5.0c.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 IUSE=""
 
@@ -10,16 +10,11 @@ SRC_URI="mirror://sourceforge/dacode/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc"
 
 DEPEND="virtual/libc
 	virtual/x11"
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "parallel make failed"
-}
-
 src_install () {
 	einstall || die "make install failed"
 
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.5.0g.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.5.0g.ebuild
index 9c5e93aa7c86..f1dcb2e78bfe 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.5.0g.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.5.0g.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/wmcoincoin-2.5.0g.ebuild,v 1.1 2005/06/25 13:29:51 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcoincoin/wmcoincoin-2.5.0g.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 IUSE=""
 
@@ -10,18 +10,12 @@ SRC_URI="mirror://sourceforge/dacode/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 
 DEPEND="virtual/libc
 		virtual/x11
 		media-libs/imlib2"
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "parallel make failed"
-}
-
-
 src_install () {
 	einstall || die "make install failed"
 
diff --git a/x11-plugins/wmcp/ChangeLog b/x11-plugins/wmcp/ChangeLog
index f33323d44aaa..64de8351fd3b 100644
--- a/x11-plugins/wmcp/ChangeLog
+++ b/x11-plugins/wmcp/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for x11-plugins/wmcp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.1 2002/10/04 14:49:33 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> wmcp-1.2.8.ebuild:
+  stable on ia64
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmcp-1.2.8.ebuild:
+  glibc -> libc
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> wmcp-1.2.8.ebuild:
+  Stable on alpha.
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> wmcp-1.2.8.ebuild:
+  Marking stable on hppa
+
+  24 Sep 2003; Seemant Kulleen <seemant@gentoo.org> wmcp-1.2.8.ebuild,
+  files/makefile.diff, files/wmcp-1.2.8-gcc33.patch,
+  files/wmcp-1.2.8-makefile.patch:
+  gcc-3.3 fixes by: Christopher Culver <crculver@users.sourceforge.net> in bug
+  #29157. Also, the patches are renamed to make more sense
 
 *wmcp-1.2.8 (04 Oct 2002)
 
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index e69de29bb2d1..1d8377ac06c9 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -0,0 +1,6 @@
+MD5 58e34eacbc23b4b917c2d04563342e8f wmcp-1.2.8.ebuild 732
+MD5 e5ff8aee49c4e84730f09b8fbab509be ChangeLog 1248
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 bdcccfed4408157d33483585f88c7ccc files/wmcp-1.2.8-makefile.patch 446
+MD5 47184d848f1e3cd7af6cbbf1da2ebdca files/digest-wmcp-1.2.8 60
+MD5 58db56f4ed82092432d3db3cc07748da files/wmcp-1.2.8-gcc33.patch 2397
diff --git a/x11-plugins/wmcp/metadata.xml b/x11-plugins/wmcp/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmcp/metadata.xml
+++ b/x11-plugins/wmcp/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index 58fb14b61716..3822e403cf30 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
@@ -1,38 +1,33 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.1 2002/10/04 14:49:33 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
+inherit eutils
 
+IUSE=""
 DESCRIPTION="A pager dockapp"
-HOMEPAGE="http://www.the.page.doesnt.seem.to.exist.anymore.com"
+HOMEPAGE="http://www.dockapps.com/file.php/id/158"
 SRC_URI="http://linux-sea.tucows.webusenet.com/files/x11/dock/${P}.tar.gz"
-
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ia64 ppc ~sparc alpha hppa ~mips"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11"
-RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/makefile.diff || die "patch failed"
-
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-gcc33.patch
 }
 
 src_compile() {
-
 	make || die "make failed"
-
 }
 
 src_install() {
-
 	cd ${S}
 	dobin wmcp
-
+	dodoc README
 }
diff --git a/x11-plugins/wmcpuload/ChangeLog b/x11-plugins/wmcpuload/ChangeLog
index aeb29b876b05..7aa4ef6c7330 100644
--- a/x11-plugins/wmcpuload/ChangeLog
+++ b/x11-plugins/wmcpuload/ChangeLog
@@ -1,15 +1,64 @@
 # ChangeLog for x11-plugins/wmcpuload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/ChangeLog,v 1.1 2002/08/30 07:51:31 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmcpuload-1.0.1.ebuild:
+  Removed INSTALL from dodoc.
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmcpuload-1.0.1.ebuild:
+  Mark 1.0.1 stable on alpha
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> wmcpuload-1.0.1.ebuild:
+  ~alpha keyword, bug 78658.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmpcuload-1.0.0.ebuild:
+  Remove older ebuild.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmcpuload-1.0.1.ebuild:
+  stable on ppc64, bug #62252
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> wmcpuload-1.0.1.ebuild:
+  Added ~mips keyword.
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> wmcpuload-1.0.0.ebuild,
+  wmcpuload-1.0.1.ebuild:
+  Marked 1.0.1 stable on sparc and adjusted the copyright dates in all.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> wmcpuload-1.0.1.ebuild:
+  Make stable on ppc
+  Thanks to Florian Daniel for the testing
+
+  04 Nov 2003; Brandy Westcott brandy@gentoo.org wmcpuload-1.0.1.ebuild:
+  Small fix to install docs.
+
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> wmcpuload-1.0.1.ebuild:
+  Marked stable for x86.
+
+  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org> wmcpuload-1.0.1.ebuild:
+  xpm is provided by xfree
+
+*wmcpuload-1.0.1 (19 May 2003)
+
+  19 May 2003; Martin Holzer <mholzer@gentoo.org> wmcpuload-1.0.1.ebuild:
+  Version bumped. Closes #21285.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*wmcpuload-1.0.0 (04 Oct 2002)
+
+  29 Mar 2003; Seemant Kulleen <seemant@gentoo.org> wmcpuload-1.0.0.ebuild:
+  HOMEPAGE fix by Frantz Dhin <tragedy_rm@hotmail.com> in bug #18299
+
+  04 Oct 2002; Nick Hadaway <raker@gentoo.org> wmcpuload-1.0.0.ebuild,
+  files/digest-wmcpuload-1.0.0 :
+  Version bump.
 
 *WMCPULoad-0.8.1 (1 Feb 2002)
 
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
-
   Relocated to x11-plugins, and renamed to wmcpuload from WMCPULoad
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/x11-plugins/wmcpuload/Manifest b/x11-plugins/wmcpuload/Manifest
index cbd212efbe94..d26aa344f970 100644
--- a/x11-plugins/wmcpuload/Manifest
+++ b/x11-plugins/wmcpuload/Manifest
@@ -1,5 +1,4 @@
-MD5 89d8b00a26b8ad1d1699a81744d76e09 ChangeLog 1190
-MD5 00842bb4ed46643f6eb7cc3ac7efe380 wmcpuload-1.0.0.ebuild 563
-MD5 65de3324927552d80e0b38a39cb67f86 wmcpuload-1.0.1.ebuild 581
-MD5 6d1459816b61d1acbea215781c22aa9d files/digest-wmcpuload-1.0.0 132
+MD5 92a426b921bc38b249b56047478a0943 wmcpuload-1.0.1.ebuild 619
+MD5 a979202cb0eb6063f141f3a9b145b6f9 ChangeLog 2545
+MD5 338abf782d9eddae3d0633df0aacc673 metadata.xml 671
 MD5 4b40548905ea5d3b7412d308399ff826 files/digest-wmcpuload-1.0.1 67
diff --git a/x11-plugins/wmcpuload/metadata.xml b/x11-plugins/wmcpuload/metadata.xml
index d61dd985a006..b25bfc12f3e0 100644
--- a/x11-plugins/wmcpuload/metadata.xml
+++ b/x11-plugins/wmcpuload/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild
index 0a36dac1844f..ddf02255c9de 100644
--- a/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild
+++ b/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild,v 1.1 2003/05/19 21:18:56 mholzer Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="WMCPULoad is a program to monitor CPU usage."
 HOMEPAGE="http://www.sh.rim.or.jp/~ssato/dockapp/index.shtml"
 SRC_URI="http://www.sh.rim.or.jp/~ssato/src/${P}.tar.bz2"
 
-DEPEND="virtual/x11
-	media-libs/xpm"
+DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
 
 src_install () {
 	einstall || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
diff --git a/x11-plugins/wmcube/ChangeLog b/x11-plugins/wmcube/ChangeLog
index c5efe1f1dae2..5faca8c7dbe9 100644
--- a/x11-plugins/wmcube/ChangeLog
+++ b/x11-plugins/wmcube/ChangeLog
@@ -1,8 +1,23 @@
-# ChangeLog for x11-plugins/wmcube-0.98
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/ChangeLog,v 1.1 2002/10/24 18:17:04 raker Exp $
+# ChangeLog for x11-plugins/wmcube
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
-wmcube-0.98 (24 Oct 2002)
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmcube-0.98.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmcube-0.98.ebuild:
+  stable on ppc64, bug #62253
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmcube-0.98.ebuild:
+  glibc -> libc
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> wmcube-0.98.ebuild:
+  Added ~mips keyword.
+
+*wmcube-0.98 (24 Oct 2002)
+
+  03 Feb 2003; Nick Hadaway <raker@gentoo.org> wmcube-0.98.ebuild :
+  Updated the HOMEPAGE and SRC_URI as the authors request.
 
   24 Oct 2002; Nick Hadaway <raker@gentoo.org> wmcube-0.98.ebuild,
   files/digest-wmcube-0.98 :
diff --git a/x11-plugins/wmcube/Manifest b/x11-plugins/wmcube/Manifest
index e69de29bb2d1..f82b68ee81a9 100644
--- a/x11-plugins/wmcube/Manifest
+++ b/x11-plugins/wmcube/Manifest
@@ -0,0 +1,4 @@
+MD5 08fc7f5de4c846902afc97ced6442791 ChangeLog 916
+MD5 bdbaa3e675d7bb6539f9336a116d4277 metadata.xml 333
+MD5 8e98d57723a332c602bc63b95e8540f4 wmcube-0.98.ebuild 735
+MD5 8342d498dd6e6c16135385f642627896 files/digest-wmcube-0.98 62
diff --git a/x11-plugins/wmcube/metadata.xml b/x11-plugins/wmcube/metadata.xml
index 65e39312b932..14a21e02877b 100644
--- a/x11-plugins/wmcube/metadata.xml
+++ b/x11-plugins/wmcube/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmcube/wmcube-0.98.ebuild b/x11-plugins/wmcube/wmcube-0.98.ebuild
index d96bd0f86327..ef7bb8a85edb 100644
--- a/x11-plugins/wmcube/wmcube-0.98.ebuild
+++ b/x11-plugins/wmcube/wmcube-0.98.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/wmcube-0.98.ebuild,v 1.1 2002/10/24 18:17:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcube/wmcube-0.98.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 DESCRIPTION="a dockapp cpu monitor with spinning 3d objects"
-HOMEPAGE="http://boombox.campus.luth.se"
-SRC_URI="http://www.stud.ifi.uio.no/~steingrd/${P}.tar.gz"
+HOMEPAGE="http://kling.mine.nu/kling/wmcube.htm"
+SRC_URI="http://kling.mine.nu/kling/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ~mips ppc ppc64 ~sparc"
 
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11"
 
 S="${WORKDIR}/${P}/wmcube"
@@ -24,16 +24,13 @@ src_compile() {
 }
 
 src_install() {
+	dobin wmcube
 
-  dobin wmcube
-
-  cd ..
-  dodoc README CHANGES
-
-  SHARE=${DESTTREE}/share/wmcube
-  dodir ${SHARE}
-  insinto ${SHARE}
-  doins 3dObjects/*
+	cd ..
+	dodoc README CHANGES
 
+	SHARE=${DESTTREE}/share/wmcube
+	dodir ${SHARE}
+	insinto ${SHARE}
+	doins 3dObjects/*
 }
-
diff --git a/x11-plugins/wmdate/ChangeLog b/x11-plugins/wmdate/ChangeLog
index ad5298c8d550..dc68b7315203 100644
--- a/x11-plugins/wmdate/ChangeLog
+++ b/x11-plugins/wmdate/ChangeLog
@@ -1,9 +1,30 @@
 # ChangeLog for x11-plugins/wmdate
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/ChangeLog,v 1.1 2004/07/17 01:31:38 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  15 May 2005; Jan Brinkmann <luckyduck@gentoo.org> wmdate-0.7.ebuild:
+  stable on amd64
+
+  05 Dec 2004; Tom Martin <slarti@gentoo.org> wmdate-0.7.ebuild:
+  Marked ~amd64, resolves bug 69978.
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmdate-0.7.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmdate-0.7.ebuild:
+  stable on ppc64, bug #62254
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmdate-0.7.ebuild:
+  Masked wmdate-0.7.ebuild stable for ppc
+
+  28 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmdate-0.7.ebuild:
+  Stable on x86.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> wmdate-0.7.ebuild:
+  Added to ~ppc.
 
 *wmdate-0.7 (17 Jul 2004)
 
-  17 Jul 2004; Michele Noberasci <s4t4n@gentoo.org> wmdate-0.7.ebuild:
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmdate-0.7.ebuild:
   Initial import. Thanks to Przemyslaw Maciag. Closes #54551.
 
diff --git a/x11-plugins/wmdate/Manifest b/x11-plugins/wmdate/Manifest
index 265a8bdaa038..e6f0569f7197 100644
--- a/x11-plugins/wmdate/Manifest
+++ b/x11-plugins/wmdate/Manifest
@@ -1,3 +1,16 @@
-MD5 7bd906463a7fb689f6c740b7a119a808 wmdate-0.7.ebuild 861
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3acfb6944cb297465fbd5c5cfba7808c wmdate-0.7.ebuild 958
+MD5 2d89c50adf030927352a0ce95cfcdf3b ChangeLog 1041
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 cbce7d60a34c9e6e85e1ceca103ba8b0 files/wmdate.desktop 210
 MD5 3531a546777dce8d7d88b1a576413556 files/digest-wmdate-0.7 61
+MD5 a842ee25f4a612037b0b05c2b05f7fe7 files/wmdate-ComplexProgramTargetNoMan.patch 349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFChpxG06ebR+OMO78RAr3eAJ9wESiJ3vgDW73lcNLsO3tLiwplwACePWLF
+TcupP9MiYB3o8fOZKxuctJc=
+=/WKs
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmdate/wmdate-0.7.ebuild b/x11-plugins/wmdate/wmdate-0.7.ebuild
index 5341692b9a37..b450ee880538 100644
--- a/x11-plugins/wmdate/wmdate-0.7.ebuild
+++ b/x11-plugins/wmdate/wmdate-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/wmdate-0.7.ebuild,v 1.1 2004/07/17 01:31:38 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/wmdate-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ppc64 ~sparc amd64"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmdeskguide/ChangeLog b/x11-plugins/wmdeskguide/ChangeLog
index af818f049017..e48849140578 100644
--- a/x11-plugins/wmdeskguide/ChangeLog
+++ b/x11-plugins/wmdeskguide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmdeskguide
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdeskguide/ChangeLog,v 1.1 2003/06/06 12:48:20 robh Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdeskguide/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmdeskguide-0.2.ebuild:
+  Added ~sparc keyword.
+
+  23 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmdeskguide-0.2.ebuild:
+  Stable for x86.
 
 *wmdeskguide-0.2 (06 Jun 2003)
 
diff --git a/x11-plugins/wmdeskguide/Manifest b/x11-plugins/wmdeskguide/Manifest
index 9e2438a89085..cf0ccd8e4545 100644
--- a/x11-plugins/wmdeskguide/Manifest
+++ b/x11-plugins/wmdeskguide/Manifest
@@ -1,3 +1,4 @@
-MD5 be4550d304f39ba96f1b76122d4fcb8b wmdeskguide-0.2.ebuild 545
-MD5 92e0516c469ff68250d0375a9f19f825 ChangeLog 362
+MD5 7a532f6488555cf1049187ea12cd7c95 ChangeLog 638
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 86c055269328139e0dab108dea314632 wmdeskguide-0.2.ebuild 711
 MD5 2f1c5c5649e20f2484f5fdcae7cf45ab files/digest-wmdeskguide-0.2 66
diff --git a/x11-plugins/wmdeskguide/metadata.xml b/x11-plugins/wmdeskguide/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmdeskguide/metadata.xml
+++ b/x11-plugins/wmdeskguide/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmdeskguide/wmdeskguide-0.2.ebuild b/x11-plugins/wmdeskguide/wmdeskguide-0.2.ebuild
index 9f7a63b88800..3912b81927d9 100644
--- a/x11-plugins/wmdeskguide/wmdeskguide-0.2.ebuild
+++ b/x11-plugins/wmdeskguide/wmdeskguide-0.2.ebuild
@@ -1,7 +1,11 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdeskguide/wmdeskguide-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
 MY_P=${P/deskg/DeskG}
 S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="WMaker DockApp: GNOME 1.4 DeskGuide port for the Window Maker environment."                                                                        
+IUSE=""
+DESCRIPTION="WMaker DockApp: GNOME 1.4 DeskGuide port for the Window Maker environment."
 SRC_URI="http://charybda.icm.edu.pl/~jarwyp/download/${MY_P}.tar.gz"
 HOMEPAGE="http://charybda.icm.edu.pl/~jarwyp/"
 
@@ -12,12 +16,12 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc ~sparc"
 
 src_compile() {
-        make
+	make
 }
 
 src_install () {
-        dobin wmDeskGuide
+	dobin wmDeskGuide
 }
diff --git a/x11-plugins/wmdf/ChangeLog b/x11-plugins/wmdf/ChangeLog
index 31b63f0c909c..43eb98f69cc5 100644
--- a/x11-plugins/wmdf/ChangeLog
+++ b/x11-plugins/wmdf/ChangeLog
@@ -1,6 +1,29 @@
-# ChangeLog for x11-misc/wmdf
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/ChangeLog,v 1.1 2004/02/07 04:23:27 port001 Exp $
+# ChangeLog for x11-plugins/wmdf
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> -wmdf-0.1.6.ebuild,
+  wmdf-0.1.6-r1.ebuild:
+  Fixed dodoc not to install COPYING and/or INSTALL.
+
+*wmdf-0.1.6-r1 (06 Jul 2005)
+
+  06 Jul 2005; Michele Noberasco <s4t4n@gentoo.org> wmdf-0.1.6-r1:
+  Revision bump, with patch to remove special filesystem entries from
+  listing, see bug #97856, and another one to remove unimplemented
+  command line args... The changes so atomic that I feel confident
+  enough to mark this directly as stable...
+  metadata.xml:
+  Assigned to desktop-dock herd.  
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmdf-0.1.6.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmdf-0.1.6.ebuild:
+  stable on ppc64, bug #62255
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> wmdf-0.1.6.ebuild:
+  Marked stable.
 
 *wmdf-0.1.6 (07 Feb 2004)
 
diff --git a/x11-plugins/wmdf/Manifest b/x11-plugins/wmdf/Manifest
index 4722d3a933e5..af5a3cab7187 100644
--- a/x11-plugins/wmdf/Manifest
+++ b/x11-plugins/wmdf/Manifest
@@ -1,4 +1,6 @@
-MD5 065dc15f0032975a0dcbef69b3bc808a ChangeLog 428
-MD5 f459e4bcc2f16c31e3676633563e0314 wmdf-0.1.6.ebuild 661
+MD5 269f2f56f171ef92246248484ec52874 ChangeLog 1402
+MD5 f12992b80bc1875d12e86a74a6496923 files/digest-wmdf-0.1.6-r1 62
+MD5 54fd7dd35b7dec866321174337e9d6d5 files/wmdf_cmd_line_args.patch 699
+MD5 212d3ec9305c95f80873f17ffdc0fa0b files/wmdf_sys-fs.patch 1057
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
-MD5 f12992b80bc1875d12e86a74a6496923 files/digest-wmdf-0.1.6 62
+MD5 54a6b7eb7bf9b13bc671b0697ef88ff2 wmdf-0.1.6-r1.ebuild 924
diff --git a/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild b/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild
index 281ca4f0c29a..04845da78398 100644
--- a/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild
+++ b/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild,v 1.1 2005/07/06 08:21:57 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit eutils
 
@@ -34,5 +34,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "Install failed"
-	dodoc README AUTHORS COPYING ChangeLog NEWS THANKS TODO INSTALL
+	dodoc README AUTHORS ChangeLog NEWS THANKS TODO
 }
diff --git a/x11-plugins/wmdiskmon/ChangeLog b/x11-plugins/wmdiskmon/ChangeLog
index 24f7643617f0..b94d1d8eaa6c 100644
--- a/x11-plugins/wmdiskmon/ChangeLog
+++ b/x11-plugins/wmdiskmon/ChangeLog
@@ -1,9 +1,25 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdiskmon/ChangeLog,v 1.1 2004/06/22 20:08:27 s4t4n Exp $
+# ChangeLog for x11-plugins/wmdiskmon
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdiskmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmdiskmon-0.0.1.ebuild:
+  Removed INSTALL from dodoc.
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmdiskmon-0.0.1.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmdiskmon-0.0.1.ebuild:
+  Masked wmdiskmon-0.0.1.ebuild stable for ppc
+
+  03 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmdiskmon-0.0.1.ebuild:
+  Stable for x86.
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> wmdiskmon-0.0.1.ebuild:
+  Added to ~ppc.
 
 *wmdiskmon-0.0.1 (22 Jun 2004)
 
-  02 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmdiskmon-0.0.1.ebuild:
+  22 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmdiskmon-0.0.1.ebuild:
   Initial import. Closes bug #44612.
 
diff --git a/x11-plugins/wmdiskmon/Manifest b/x11-plugins/wmdiskmon/Manifest
index 5dacad50dabb..4a47d673951b 100644
--- a/x11-plugins/wmdiskmon/Manifest
+++ b/x11-plugins/wmdiskmon/Manifest
@@ -1,4 +1,4 @@
-MD5 9223da12ff2818388d2f371d19b7abbc wmdiskmon-0.0.1.ebuild 519
-MD5 608fdd2f0f6696494bba8c56640f4625 ChangeLog 280
+MD5 e88e03e6d489bc89b9a28948604f9737 wmdiskmon-0.0.1.ebuild 602
+MD5 e0689506110b8d4a07ae7ce08df69c5c ChangeLog 877
 MD5 5a911acf5f3d1a8e9877487700a830de metadata.xml 251
 MD5 630236cddf69bb537e5b04c4cc34406c files/digest-wmdiskmon-0.0.1 66
diff --git a/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild b/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild
index 35a6e7426ab7..b9d307df8ffb 100644
--- a/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild
+++ b/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild,v 1.1 2004/06/22 20:08:27 s4t4n Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 IUSE=""
 
@@ -11,7 +9,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~sparc"
 LICENSE="GPL-2"
 
 DEPEND="virtual/x11"
@@ -19,5 +17,5 @@ DEPEND="virtual/x11"
 src_install () {
 	einstall || die "Installation failed"
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
diff --git a/x11-plugins/wmdl/ChangeLog b/x11-plugins/wmdl/ChangeLog
index 5ae8f9e33f15..afc318741b1f 100644
--- a/x11-plugins/wmdl/ChangeLog
+++ b/x11-plugins/wmdl/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-plugins/wmdl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/ChangeLog,v 1.1 2002/10/04 15:15:52 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> wmdl-1.4.1.ebuild:
+  Stable on ppc.
+
+  28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> wmdl-1.4.1.ebuild:
+  mark ~ppc
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmdl-1.4.1.ebuild:
+  Added ~sparc keyword.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmdl-1.4.1.ebuild:
+  glibc -> libc
+
+  19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmdl-1.4.1.ebuild:
+  Inherit eutils.
 
 *wmdl-1.4.1 (04 Oct 2002)
 
diff --git a/x11-plugins/wmdl/Manifest b/x11-plugins/wmdl/Manifest
index e69de29bb2d1..8231a32ae9b1 100644
--- a/x11-plugins/wmdl/Manifest
+++ b/x11-plugins/wmdl/Manifest
@@ -0,0 +1,5 @@
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 e8bfc234225092121e2a5e7afebfbabd ChangeLog 961
+MD5 338ce9b00a34b671f4dd19a5235de295 wmdl-1.4.1.ebuild 694
+MD5 cd8208ba83521905ef78846f0fb6a239 files/digest-wmdl-1.4.1 61
+MD5 28aff2860e161b9418ab4843516d64e1 files/makefile.diff 1030
diff --git a/x11-plugins/wmdl/metadata.xml b/x11-plugins/wmdl/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmdl/metadata.xml
+++ b/x11-plugins/wmdl/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmdl/wmdl-1.4.1.ebuild b/x11-plugins/wmdl/wmdl-1.4.1.ebuild
index f1302309ec29..184f990fc203 100644
--- a/x11-plugins/wmdl/wmdl-1.4.1.ebuild
+++ b/x11-plugins/wmdl/wmdl-1.4.1.ebuild
@@ -1,38 +1,31 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/wmdl-1.4.1.ebuild,v 1.1 2002/10/04 15:15:52 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/wmdl-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
+inherit eutils
 
+IUSE=""
 DESCRIPTION="WindowMaker Doom Load dockapp"
 HOMEPAGE="http://the.homepage.doesnt.appear.to.exist.anymore.com"
 SRC_URI="http://www.ibiblio.org/pub/linux/distributions/gentoo/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11"
-RDEPEND="${DEPEND}"
 
 src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/makefile.diff || die "patch failed"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/makefile.diff
 
 }
 
 src_compile() {
-
 	make || die "parallel make failed"
-
 }
 
 src_install() {
-
-	cd ${S}
 	dobin wmdl
-
 }
diff --git a/x11-plugins/wmdots/ChangeLog b/x11-plugins/wmdots/ChangeLog
index 02fc8350b2ac..fb1355d4469a 100644
--- a/x11-plugins/wmdots/ChangeLog
+++ b/x11-plugins/wmdots/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmdots
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+  12 Jun 2003; <msterret@gentoo.org> wmdots-0.2_beta.ebuild:
+  fix Header
 
 *wmdots-0.2_beta (15 Dec 2002)
   
diff --git a/x11-plugins/wmdots/Manifest b/x11-plugins/wmdots/Manifest
index e69de29bb2d1..bdacb362bf0f 100644
--- a/x11-plugins/wmdots/Manifest
+++ b/x11-plugins/wmdots/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ad9eddd3be2dce48fec993a07b2d3521 ChangeLog 564
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 bb9c4089bf206494d2c69574416285b9 wmdots-0.2_beta.ebuild 578
+MD5 4031338ccfa2db6b7b0033f1c972efa2 files/digest-wmdots-0.2_beta 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBXs1LI1lqEGTUzyQRAkZKAKDPlflBcK6cTjjEdu8V8bf6gVhrggCg19fr
++1uYxOzRQeX3ie5E4VGGkFQ=
+=ApOF
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmdots/metadata.xml b/x11-plugins/wmdots/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmdots/metadata.xml
+++ b/x11-plugins/wmdots/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
index a8710e6afd54..7d560b4bcbfe 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta.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
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/wmdots-0.2_beta.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
 MY_P=wmdots-0.2beta
 S=${WORKDIR}/${PN}
@@ -8,7 +8,7 @@ DESCRIPTION="Multi shape 3d rotating dots"
 SRC_URI="http://dockapps.org/download.php/id/153/${MY_P}.tar.gz"
 HOMEPAGE="http://dockapps.org/file.php/id/116"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
 
 IUSE=""
@@ -19,7 +19,7 @@ DEPEND="virtual/x11"
 src_compile() {
 
 	emake || die
-	
+
 }
 
 src_install () {
diff --git a/x11-plugins/wmdrawer/ChangeLog b/x11-plugins/wmdrawer/ChangeLog
index db080c38a2de..6932f523d82a 100644
--- a/x11-plugins/wmdrawer/ChangeLog
+++ b/x11-plugins/wmdrawer/ChangeLog
@@ -1,6 +1,78 @@
 # ChangeLog for x11-plugins/wmdrawer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.1 2003/06/03 06:12:01 bcowan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+  14 Nov 2005; Luis Medinas <metalgod@gentoo.org> wmdrawer-0.10.5-r2.ebuild:
+  Marked Stable on amd64.
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmdrawer-0.10.5-r2.ebuild,
+  wmdrawer-0.10.5.ebuild:
+  Removed INSTALL and COPYING from dodoc.
+
+*wmdrawer-0.10.5-r2 (20 Sep 2005)
+
+  20 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> wmdrawer-0.10.5-r2.ebuild:
+  Revision bump, substituting gtk2 with gtk USE flag. I'm leaving already unmasked
+  archs as they are, since this is a non-change anyway. Fixes bug #106560.
+  wmdrawer-0.10.5-r1.ebuild:
+  Wiped out previous ebuild.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmdrawer-0.10.5-r1.ebuild:
+  Stable on ppc.
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmdrawer-0.10.5-r1.ebuild:
+  Stable for x86.
+
+*wmdrawer-0.10.5-r1 (29 Mar 2005)
+
+  29 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmdrawer-0.10.5-r1.ebuild:
+  Revision bump, adding support for gtk2 USE flag. Add added some magic sed
+  to honour Gentoo CFLAGS.
+  wmdrawer-0.10.4.1.ebuild:
+  Wiped out older ebuild.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmdrawer-0.10.5.ebuild:
+  Stable on amd64.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmdrawer-0.10.5.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmdrawer-0.10.5.ebuild:
+  Masked wmdrawer-0.10.5.ebuild stable for ppc
+
+*wmdrawer-0.10.5 (01 Aug 2004)
+
+  01 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmdrawer-0.10.5.ebuild:
+  Version bump.
+  wmdrawer-0.10.4.1.ebuild:
+  Add gzip to DEPEND. Stable on x86.
+  wmdrawer-0.10.2.ebuild:
+  Remove older ebuild.
+
+  15 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmdrawer-0.10.4.1.ebuild:
+  Stable on amd64.
+
+*wmdrawer-0.10.4.1 (02 Nov 2003)
+
+  02 Nov 2003; Markus Nigbur <pyrania@gentoo.org> wmdrawer-0.10.1.ebuild,
+  wmdrawer-0.10.2.ebuild, wmdrawer-0.10.4.1.ebuild, wmdrawer-0.9.15.ebuild:
+  Version bump and removed old versions.
+
+*wmdrawer-0.10.2 (26 Sep 2003)
+
+  26 Sep 2003; Brad Cowan <bcowan@gentoo.org> wmdrawer-0.10.2.ebuild:
+  Version bump.
+
+  12 Jun 2003; <msterret@gentoo.org> wmdrawer-0.10.1.ebuild,
+  wmdrawer-0.9.15.ebuild:
+  add Header
+
+*wmdrawer-0.10.1 (03 Jun 2003)
+
+  03 Jun 2003; Brad Cowan <bcowan@gentoo.org> wmdrawer-0.10.1.ebuild:
+  bumped version
 
 *wmdrawer-0.9.15 (03 Jun 2003)
 
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index 7b1c6cb02c4a..59fbe9315074 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,2 +1,17 @@
-MD5 e008735852f3a3d2bda57188ba33c368 wmdrawer-0.9.15.ebuild 658
-MD5 dd0ac5c46a52772e129e9a28ccc5f768 files/digest-wmdrawer-0.9.15 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 83b2e3af7f3696b8343fedf70b61eaab ChangeLog 2651
+MD5 5ad9832d22021a0946294d43574d3a8e files/digest-wmdrawer-0.10.5 66
+MD5 5ad9832d22021a0946294d43574d3a8e files/digest-wmdrawer-0.10.5-r2 66
+MD5 94bb15f1aab434295518a9a3cb0a4afe files/wmdrawer-0.10.5-gtk+-2.patch 370
+MD5 3c43064285561d1783722ecf8d694c51 metadata.xml 302
+MD5 4c361d5ffe7fc5052f00db932a6b72f1 wmdrawer-0.10.5-r2.ebuild 1071
+MD5 dde0084ab17e3672b3d2ef1563b470cc wmdrawer-0.10.5.ebuild 881
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDeKBjwUpWvClEHQoRAqaTAKCCDQo3VB4McvXq+gEBOjVMM6htwwCeOMjJ
+Uf/jtyOBGsRQrdGLfV4+068=
+=fCYe
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmdrawer/metadata.xml b/x11-plugins/wmdrawer/metadata.xml
index c79a74f2cac4..e0d2cdc50f22 100644
--- a/x11-plugins/wmdrawer/metadata.xml
+++ b/x11-plugins/wmdrawer/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
index 81362758680a..2d1bbbcddf56 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild,v 1.1 2005/09/20 07:28:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 DEPEND="virtual/x11
 	gtk? (	>=x11-libs/gtk+-2 )
@@ -39,7 +39,7 @@ src_compile()
 src_install()
 {
 	dobin wmdrawer
-	dodoc COPYING INSTALL README TODO AUTHORS ChangeLog wmdrawerrc.example
+	dodoc README TODO AUTHORS ChangeLog wmdrawerrc.example
 	gzip -cd doc/wmdrawer.1x.gz > wmdrawer.1
 	doman wmdrawer.1
 }
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild
index 6ca7a58d66d0..a56654152879 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild,v 1.1 2004/07/31 22:41:36 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="wmDrawer is a dock application (dockapp) which provides a drawer (retractable button bar) to launch applications"
@@ -9,7 +9,7 @@ HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 amd64 ~sparc ppc"
 
 DEPEND="virtual/x11
 	>=media-libs/gdk-pixbuf-0.22.0
@@ -24,7 +24,7 @@ src_compile()
 src_install()
 {
 	dobin wmdrawer
-	dodoc COPYING INSTALL README TODO AUTHORS ChangeLog wmdrawerrc.example
+	dodoc README TODO AUTHORS ChangeLog wmdrawerrc.example
 	gzip -cd doc/wmdrawer.1x.gz > wmdrawer.1
 	doman wmdrawer.1
 }
diff --git a/x11-plugins/wmfire/ChangeLog b/x11-plugins/wmfire/ChangeLog
index 3f0067e2b376..7a1ea0f102a8 100644
--- a/x11-plugins/wmfire/ChangeLog
+++ b/x11-plugins/wmfire/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for x11-misc/wmfire
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.1 2002/10/24 19:19:06 raker Exp $
+# ChangeLog for x11-plugins/wmfire
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+  10 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmfire-0.0.3.9_pre4.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmfire-0.0.3.9_pre4.ebuild:
+  Added ~sparc keyword.
 
 *wmfire-0.0.3.9_pre4 (4-Aug-2002)
 
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index e69de29bb2d1..55f8c07a8ca1 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -0,0 +1,4 @@
+MD5 55ce7b20948030b8cf8495b03b6e49e8 wmfire-0.0.3.9_pre4.ebuild 828
+MD5 e93ff19564e1d2f41abf7331fad402ee ChangeLog 708
+MD5 97a3c433dedf17a58b1925fb03fd98dc metadata.xml 421
+MD5 d2bc8814aced69946c3550ea604bbdd2 files/digest-wmfire-0.0.3.9_pre4 69
diff --git a/x11-plugins/wmfire/metadata.xml b/x11-plugins/wmfire/metadata.xml
index 2ae6b45d4ec5..2383f97840cd 100644
--- a/x11-plugins/wmfire/metadata.xml
+++ b/x11-plugins/wmfire/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild b/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild
index 2be46dfd42d6..ac2292cbf4f0 100644
--- a/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild
+++ b/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild
@@ -1,21 +1,21 @@
-# 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-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild,v 1.1 2002/10/24 19:19:06 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+IUSE=""
 
 MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="WindowMaker dockapp that displays cpu usage as a dancing flame"
 SRC_URI="http://staff.xmms.org/zinx/misc/${MY_P}.tar.gz"
 HOMEPAGE="http://staff.xmms.org/zinx/misc"
 
-DEPEND="virtual/x11 x11-wm/WindowMaker virtual/glibc"
+DEPEND="virtual/x11"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ppc ~sparc"
 
 src_compile() {
 
@@ -32,6 +32,6 @@ src_install () {
 		sysconfdir=${D}/etc \
 		localstatedir=${D}/var/lib || die
 
-	dodoc AUTHORS COPYING CREDITS INSTALL NEWS README
+	dodoc AUTHORS CREDITS NEWS README
 
 }
diff --git a/x11-plugins/wmfishtime/ChangeLog b/x11-plugins/wmfishtime/ChangeLog
index 543f0c767af3..0c4195e25978 100644
--- a/x11-plugins/wmfishtime/ChangeLog
+++ b/x11-plugins/wmfishtime/ChangeLog
@@ -1,7 +1,41 @@
 # ChangeLog for x11-plugins/wmfishtime
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmfishtime-1.24.ebuild,
+  wmfishtime-1.23-r2.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> wmfishtime-1.24.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmfishtime-1.24.ebuild:
+  Stable on ppc.
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  wmfishtime-1.24.ebuild:
+  Stable on sparc
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmfishtime-1.24.ebuild:
+  Stable for x86.
+
+*wmfishtime-1.24 (29 Mar 2005)
+
+  29 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmfishtime-1.24.ebuild:
+  Version bump. Closes #86805.
+  wmfishtime-1.23-r1.ebuild:
+  Wiped out older ebuild.
+
+  31 Aug 2004; Tom Gall <tgall@gentoo.org> wmfishtime-1.23-r2.ebuild:
+  stable on ppc64, bug #61762
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmfishtime-1.23-r1.ebuild,
+  wmfishtime-1.23-r2.ebuild:
+  add sed-4 dep
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmfishtime-1.23-r2 (7 Jun 2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index e69de29bb2d1..b492903066d5 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -0,0 +1,6 @@
+MD5 a91c9562edd35f3fe6294978e9b2ce91 wmfishtime-1.24.ebuild 846
+MD5 1ba816fbdf51322a56d3dab59a5bb61a wmfishtime-1.23-r2.ebuild 849
+MD5 265a6f534afa970b12a30d9432820205 ChangeLog 1941
+MD5 aeefe0a88d62157055bc87ee91bd2eb9 metadata.xml 396
+MD5 bb70d8fc69ca1fdd0110a62cce741a3e files/digest-wmfishtime-1.24 66
+MD5 48b96d80c8c76d6ba48ba94defe174f2 files/digest-wmfishtime-1.23-r2 66
diff --git a/x11-plugins/wmfishtime/metadata.xml b/x11-plugins/wmfishtime/metadata.xml
index 187d1679b077..1c3407201408 100644
--- a/x11-plugins/wmfishtime/metadata.xml
+++ b/x11-plugins/wmfishtime/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
index 2b3c72f2326e..1d5fb229f7a1 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.23-r2.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2002 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.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# 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.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
 # to make this work in KDE, run it with the -b option :)
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="A fun clock applet for your desktop featuring swimming fish"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc amd64 ppc ppc64"
 
-DEPEND="=x11-libs/gtk+-1.2*"
+DEPEND="=x11-libs/gtk+-1.2*
+	>=sys-apps/sed-4"
+
+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
 }
 
@@ -24,5 +28,5 @@ src_install () {
 	into /usr
 	dobin wmfishtime
 	doman wmfishtime.1
-	dodoc ALL_I_GET_IS_A_GRAY_BOX CODING INSTALL README AUTHORS COPYING
+	dodoc ALL_I_GET_IS_A_GRAY_BOX CODING README AUTHORS
 }
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24.ebuild
index 37a44d4c5fc1..a54ecc6a7a4a 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.24.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.24.ebuild,v 1.1 2005/03/29 12:50:22 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.24.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
 # to make this work in KDE, run it with the -b option :)
 IUSE=""
@@ -10,7 +10,7 @@ SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ppc ppc64 sparc x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	>=sys-apps/sed-4"
@@ -28,5 +28,5 @@ src_install () {
 	into /usr
 	dobin wmfishtime
 	doman wmfishtime.1
-	dodoc ALL_I_GET_IS_A_GRAY_BOX CODING INSTALL README AUTHORS COPYING
+	dodoc ALL_I_GET_IS_A_GRAY_BOX CODING README AUTHORS
 }
diff --git a/x11-plugins/wmfortune/ChangeLog b/x11-plugins/wmfortune/ChangeLog
index f3c56978814f..d0ee659b845c 100644
--- a/x11-plugins/wmfortune/ChangeLog
+++ b/x11-plugins/wmfortune/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-plugins/wmfortune
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfortune/ChangeLog,v 1.1 2003/06/26 12:46:33 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfortune/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> wmfortune-0.241.ebuild:
+  Added ~sparc keyword.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> wmfortune-0.241.ebuild:
+  Typo in DESCRIPTION: forune -> fortune. Bug 59717.
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmfortune-0.241.ebuild:
+  Update HOMEPAGE and SRC_URI to the www.dockapps.org ones as the original
+  give me a 404. Stable for x86.
+
+  10 Sep 2003; Michael Sterrett <msterret@gentoo.org> wmfortune-0.241.ebuild:
+  DEPEND on games-misc/fortune-mod (games reorg); also removed RDEPEND="" since
+  I bet it actually needs fortune-mod to run, not just to build.
 
 *wmfortune-0.241 (26 Jun 2003)
 
diff --git a/x11-plugins/wmfortune/Manifest b/x11-plugins/wmfortune/Manifest
index 229753eb0ad5..8ceebacf70fa 100644
--- a/x11-plugins/wmfortune/Manifest
+++ b/x11-plugins/wmfortune/Manifest
@@ -1,3 +1,4 @@
+MD5 053fd31f59e13af7c2acac6181809f43 ChangeLog 1012
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 0480d4ae04dff2ef63176b4021e60153 wmfortune-0.241.ebuild 622
 MD5 2894d43246c9e383f4d82109b8b454c5 files/digest-wmfortune-0.241 66
-MD5 c00a08e3eadf1b6c8bdb3290df60e4cc wmfortune-0.241.ebuild 612
-MD5 562e2d3d43b442dc483cd4dca761908c ChangeLog 394
diff --git a/x11-plugins/wmfortune/metadata.xml b/x11-plugins/wmfortune/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmfortune/metadata.xml
+++ b/x11-plugins/wmfortune/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
index f0afeb37b213..39e1dfefdf42 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfortune/wmfortune-0.241.ebuild,v 1.1 2003/06/26 12:46:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfortune/wmfortune-0.241.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
-DESCRIPTION="dock-app that shows forune messages"
-HOMEPAGE="http://www.01.246.ne.jp/~m-sugano/apps.html"
-SRC_URI="http://www.01.246.ne.jp/~m-sugano/${P}.tar.gz"
+IUSE=""
+DESCRIPTION="dock-app that shows fortune messages"
+HOMEPAGE="http://www.dockapps.com/file.php/id/90"
+SRC_URI="http://www.dockapps.com/download.php/id/128/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc ~sparc"
 
-DEPEND="app-games/fortune-mod
+DEPEND="games-misc/fortune-mod
 	virtual/x11"
-RDEPEND=""
 
 src_compile() {
 	emake OPTIMIZE="${CFLAGS}" || die
 }
 
-src_install() {
+src_install()
+{
 	dobin wmfortune
 	dodoc CHANGES README TODO
 }
diff --git a/x11-plugins/wmfsm/ChangeLog b/x11-plugins/wmfsm/ChangeLog
index 612d53927dcc..1b4ba0b7bc36 100644
--- a/x11-plugins/wmfsm/ChangeLog
+++ b/x11-plugins/wmfsm/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for x11-plugins/wmfsm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.1 2002/10/03 16:14:24 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmfsm-0.34-r1.ebuild:
+  Stable on amd64.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmfsm-0.34-r1.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmfsm-0.34-r1.ebuild:
+  Masked wmfsm-0.34-r1.ebuild stable for ppc
+
+*wmfsm-0.34-r1 (17 Jul 2004)
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmfsm-0.34-r1.ebuild:
+  Revision bump, this one sports updated HOMEPAGE and SRC_URI, install
+  some documentation, patch to hide 'system' file systems. Closes #50148.
+  wmfsm-0.34.ebuild:
+  update HOMEPAGE and SRC_URI.
+
+  24 Sep 2003; Jason Wever <weeve@gentoo.org> wmfsm-0.34.ebuild:
+  Added ~sparc keyword.
 
 *wmfsm-0.34 (04 Oct 2002)
 
diff --git a/x11-plugins/wmfsm/Manifest b/x11-plugins/wmfsm/Manifest
index e69de29bb2d1..edff14655efd 100644
--- a/x11-plugins/wmfsm/Manifest
+++ b/x11-plugins/wmfsm/Manifest
@@ -0,0 +1,7 @@
+MD5 7c4f180a5119ff385c2c47642b589eda ChangeLog 1076
+MD5 39661c56ab1bc5fa864646a57f8adb69 metadata.xml 339
+MD5 66f4b4a761f48378691b0285e8722382 wmfsm-0.34.ebuild 597
+MD5 541a3ee06537701b19a80b5e61722172 wmfsm-0.34-r1.ebuild 830
+MD5 faa2001cbaf8f2c2580d847c01222483 files/digest-wmfsm-0.34 62
+MD5 faa2001cbaf8f2c2580d847c01222483 files/digest-wmfsm-0.34-r1 62
+MD5 9f8c7cced30218967bced34b72081115 files/wmfsm-0.34.linux-fs.patch 586
diff --git a/x11-plugins/wmfsm/metadata.xml b/x11-plugins/wmfsm/metadata.xml
index 7eaeaaf1543a..bab79b5a9dd8 100644
--- a/x11-plugins/wmfsm/metadata.xml
+++ b/x11-plugins/wmfsm/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
index 2f8e2b29ee85..dbbfd5599ba0 100644
--- a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.1 2004/07/17 11:03:34 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.ubc.ca/~cmg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc amd64 ppc"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/wmfsm/wmfsm-0.34.ebuild b/x11-plugins/wmfsm/wmfsm-0.34.ebuild
index 89c5a73410e8..1cdf646aaa20 100644
--- a/x11-plugins/wmfsm/wmfsm-0.34.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.34.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34.ebuild,v 1.1 2002/10/03 16:14:24 raker Exp $
-
-S="${WORKDIR}/${P}"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="dockapp for monitoring filesystem usage"
-HOMEPAGE="http://www.cs.mcgill.ca/~cgray4/"
-SRC_URI="http://www.cs.mcgill.ca/~cgray4/${P}.tar.gz"
+HOMEPAGE="http://www.cs.ubc.ca/~cmg/"
+SRC_URI="http://www.cs.ubc.ca/~cmg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc amd64 ppc"
 
 DEPEND="virtual/x11"
-RDEPEND="${DEPEND}"
 
 src_compile() {
 
diff --git a/x11-plugins/wmget/ChangeLog b/x11-plugins/wmget/ChangeLog
index 6b1ea28eb937..a7882bf0968f 100644
--- a/x11-plugins/wmget/ChangeLog
+++ b/x11-plugins/wmget/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for x11-plugins/wmget
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.1 2002/10/03 15:58:00 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmget-0.6.0.ebuild:
+  Stable on amd64.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmget-0.6.0.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmget-0.6.0.ebuild:
+  Masked wmget-0.6.0.ebuild stable for ppc
+
+*wmget-0.6.0 (22 Jul 2004)
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmget-0.6.0.ebuild:
+  Version bump.
+  wmget-0.5.0.ebuild:
+  Stable for x86.
+  wmget-0.4.4.ebuild:
+  Remove old ebuilds.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmget-0.4.4.ebuild,
+  wmget-0.5.0.ebuild:
+  Adding IUSE=
+
+  19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmget-0.4.4.ebuild,
+  wmget-0.5.0.ebuild:
+  Inherit eutils.
+
+*wmget-0.5.0 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
 *wmget-0.4.4 (04 Oct 2002)
 
diff --git a/x11-plugins/wmget/Manifest b/x11-plugins/wmget/Manifest
index e69de29bb2d1..91625e55de69 100644
--- a/x11-plugins/wmget/Manifest
+++ b/x11-plugins/wmget/Manifest
@@ -0,0 +1,7 @@
+MD5 36e83bf268d06251182e42b2ae9df781 ChangeLog 1212
+MD5 e596892597ff96f2b78ca9a1319915db metadata.xml 436
+MD5 595e6e5ff7d847915ed4d2c234858a96 wmget-0.5.0.ebuild 793
+MD5 fae4c3370c91d29a65dd3340854b2245 wmget-0.6.0.ebuild 678
+MD5 7839b46d53fe997ab15799a7250a5a0f files/digest-wmget-0.5.0 66
+MD5 4ad748dd7bcc0235ebce79719f2751e5 files/makefile.diff 956
+MD5 f0f4c61dd8576a57389c4f63215b3135 files/digest-wmget-0.6.0 66
diff --git a/x11-plugins/wmget/metadata.xml b/x11-plugins/wmget/metadata.xml
index 8c23afa2c15a..7934c357922b 100644
--- a/x11-plugins/wmget/metadata.xml
+++ b/x11-plugins/wmget/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmget/wmget-0.5.0.ebuild b/x11-plugins/wmget/wmget-0.5.0.ebuild
index 156573af3dc2..980b67f7c75a 100644
--- a/x11-plugins/wmget/wmget-0.5.0.ebuild
+++ b/x11-plugins/wmget/wmget-0.5.0.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2003/03/09 20:11:53 aliz Exp $
-
-S="${WORKDIR}/${PN}"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
+inherit eutils
+IUSE=""
 DESCRIPTION="libcurl-based dockapp for automated-downloads"
 HOMEPAGE="http://amtrickey.net/wmget/"
 SRC_URI="http://amtrickey.net/download/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc"
 
 DEPEND="virtual/x11
-	>=net-ftp/curl-7.9.7"
+	>=net-misc/curl-7.9.7"
+
+S=${WORKDIR}/${PN}
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/makefile.diff || die "patch failed"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/makefile.diff
 }
 
 src_compile() {
-	emake || die "parallel make failed"
+	emake CFLAGS="${CFLAGS} -ansi -Wall -W -I/usr/X11R6/include -D_GNU_SOURCE" \
+		|| die "parallel make failed"
 }
 
 src_install() {
diff --git a/x11-plugins/wmget/wmget-0.6.0.ebuild b/x11-plugins/wmget/wmget-0.6.0.ebuild
index b52ca90fd21f..1fff3cd00c61 100644
--- a/x11-plugins/wmget/wmget-0.6.0.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.6.0.ebuild,v 1.1 2004/07/22 09:41:19 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="libcurl-based dockapp for automated-downloads"
@@ -9,7 +9,7 @@ SRC_URI="http://amtrickey.net/download/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc"
 
 DEPEND="virtual/x11
 	>=net-misc/curl-7.9.7"
diff --git a/x11-plugins/wmgrabimage/ChangeLog b/x11-plugins/wmgrabimage/ChangeLog
index a382fb24f4dc..e40311139fbd 100644
--- a/x11-plugins/wmgrabimage/ChangeLog
+++ b/x11-plugins/wmgrabimage/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for x11-plugins/wmgrabimage
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgrabimage/ChangeLog,v 1.1 2004/07/19 07:56:38 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgrabimage/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmgrabimage-0.72.ebuild:
+  Wiped out older revision.
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmgrabimage-0.72-r1.ebuild:
+  Stable on ppc.
+
+  29 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmgrabimage-0.72-r1.ebuild:
+  Stable for x86. Fix copyright headers.
+  wmgrabimage-0.72.ebuild:
+  Fix copyright headers.
+
+*wmgrabimage-0.72-r1 (05 Dec 2004)
+
+  05 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> wmgrabimage-0.72-r1.ebuild:
+  Revision bump.
+  Change HOMEPAGE and SRC_URI to the www.dockapps.org ones as the official
+  pages can no longer be reached. Some magic sed (thanks Clemens Noss <cnoss@gmx.de>)
+  to make calls to 'convert' using the '-geometry' cmd line arg, needed by newer
+  versions of media-gfx/imagemagick, closing #71894.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmgrabimage-0.72.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmgrabimage-0.72.ebuild:
+  Masked wmgrabimage-0.72.ebuild stable for ppc
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> wmgrabimage-0.72.ebuild:
+  Added to ~ppc.
 
 *wmgrabimage-0.72 (19 Jul 2004)
 
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
index 6a85595620d1..b47cfe871c70 100644
--- a/x11-plugins/wmgrabimage/Manifest
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -1,4 +1,6 @@
-MD5 94d4f45bc3c0411fff061d0bdde56b48 wmgrabimage-0.72.ebuild 886
+MD5 f576bf8c798a29659a1fee4c5944db92 wmgrabimage-0.72-r1.ebuild 1111
+MD5 5fdd4ff990d2ed525930d1153a0708b1 ChangeLog 1520
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 510f4557928c8d5b4788f93c938fb236 files/wmgrabimage.desktop 179
 MD5 ddc76446e5b95bcb71d118f3a483c1a3 files/wmgrabimage-noman.patch 296
-MD5 acb5efeb412afb808e7b493a835b57f4 files/digest-wmgrabimage-0.72 64
+MD5 acb5efeb412afb808e7b493a835b57f4 files/digest-wmgrabimage-0.72-r1 64
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
index 1e230fdcfc00..f6d227f06777 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild,v 1.1 2004/12/05 10:53:57 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmgtemp/ChangeLog b/x11-plugins/wmgtemp/ChangeLog
index 490a7d35043a..cdfb8f05dd36 100644
--- a/x11-plugins/wmgtemp/ChangeLog
+++ b/x11-plugins/wmgtemp/ChangeLog
@@ -1,7 +1,28 @@
 # ChangeLog for x11-plugins/wmgtemp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/ChangeLog,v 1.1 2002/10/07 16:24:05 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmgtemp-0.7.ebuild,
+  wmgtemp-0.6.ebuild:
+  Removed INSTALL from dodoc.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> wmgtemp-0.7.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> wmgtemp-0.6.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmgtemp-0.6.ebuild,
+  wmgtemp-0.7.ebuild:
+  add sed-4 dep
+
+*wmgtemp-0.7 (16 Nov 2003)
+
+  16 Nov 2003; Markus Nigbur <pyrania@gentoo.org> wmgtemp-0.7.ebuild:
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmgtemp-0.6 (07 Oct 2002)
 
   07 Oct 2002; Nick Hadaway <raker@gentoo.org> wmgtemp-0.6.ebuild,
diff --git a/x11-plugins/wmgtemp/Manifest b/x11-plugins/wmgtemp/Manifest
index e69de29bb2d1..e2ff096ae9fc 100644
--- a/x11-plugins/wmgtemp/Manifest
+++ b/x11-plugins/wmgtemp/Manifest
@@ -0,0 +1,6 @@
+MD5 5d08d81faf64cb8b0d67da90149a3d3e wmgtemp-0.7.ebuild 701
+MD5 31db441567d96355ee8f625870537294 wmgtemp-0.6.ebuild 726
+MD5 1d6f4fe0cc31c9d1109c1fdf9633ec86 ChangeLog 1117
+MD5 f128e870010a5e7ca189002d71e046f6 metadata.xml 655
+MD5 ee8e4d7233039755c7fe5e37f7ccc23d files/digest-wmgtemp-0.6 62
+MD5 ae0041a298d82b1a05a9a0c4c84e8555 files/digest-wmgtemp-0.7 62
diff --git a/x11-plugins/wmgtemp/metadata.xml b/x11-plugins/wmgtemp/metadata.xml
index 5151c333409a..b9205f5bda86 100644
--- a/x11-plugins/wmgtemp/metadata.xml
+++ b/x11-plugins/wmgtemp/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild b/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild
index ae022e30bd46..dfd2ff145033 100644
--- a/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild
+++ b/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # 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.1 2002/10/07 16:24:05 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmgtemp/wmgtemp-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 IUSE=""
 
@@ -12,27 +12,24 @@ SRC_URI="http://www.fluxcode.net/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="x86 -ppc -sparc -sparc64"
+KEYWORDS="x86 -ppc -sparc amd64"
 
-DEPEND="sys-apps/lm_sensors"
-RDEPEND="${DEPEND}"
+DEPEND="sys-apps/lm_sensors
+	>=sys-apps/sed-4"
 
-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() {
 
 	cd ${S}
-	dodoc BUGS CREDITS INSTALL README TODO
+	dodoc BUGS CREDITS README TODO
 
 	cd ${S}/src
 	dobin wmgtemp
diff --git a/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild b/x11-plugins/wmgtemp/wmgtemp-0.7.ebuild
index 16bd87d9bbc3..3d21f1322b38 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.
+# Copyright 1999-2005 Gentoo Foundation
 # 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.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 IUSE=""
 
@@ -12,21 +12,21 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc amd64"
 
-DEPEND="sys-apps/lm-sensors"
+DEPEND="sys-apps/lm_sensors
+	>=sys-apps/sed-4"
 
-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() {
 	cd ${S}
-	dodoc BUGS CREDITS INSTALL README TODO
+	dodoc BUGS CREDITS README TODO
 
 	cd ${S}/src
 	dobin wmgtemp
diff --git a/x11-plugins/wmhdplop/ChangeLog b/x11-plugins/wmhdplop/ChangeLog
index d054b12b5a59..f32dc087ed21 100644
--- a/x11-plugins/wmhdplop/ChangeLog
+++ b/x11-plugins/wmhdplop/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for x11-plugins/wmhdplop
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.1 2004/08/26 22:03:42 s4t4n Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmhdplop-0.9.7.ebuild:
+  Make use of built_with_use() (from eutils eclass) to fail if imlib2
+  is not compiled with 'X' USE flag enabled.
+
+  08 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmhdplop-0.9.7.ebuild:
+  Warn the user if 'X' USE flag is not set, as this package needs imlib2
+  compiled with this USE flag set. Closes bug #92100.
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmhdplop-0.9.7.ebuild:
+  Stable for x86.
+  -wmhdplop-0.9.6.ebuild:
+  Wiped out older version.
+
+*wmhdplop-0.9.7 (04 Jul 2005)
+
+  04 Jul 2005; Michele Noberasco <s4t4n@gentoo.org> wmhdplop-0.9.7.ebuild:
+  Version bump.
+
+  22 May 2005; Simon Stelling <blubb@gentoo.org> wmhdplop-0.9.6.ebuild:
+  added ~amd64 keyword
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmhdplop-0.9.6.ebuild:
+  Stable for x86.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> wmhdplop-0.9.6.ebuild:
+  Added to ~ppc.
 
 *wmhdplop-0.9.6 (26 Aug 2004)
 
diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
index 71251bc0d4e7..913b32b12f9c 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -1,2 +1,5 @@
-MD5 0a90300dead831f6de3f97db0da3e046 wmhdplop-0.9.6.ebuild 604
-MD5 eabbbed5a08e73895174ecb540e074ea files/digest-wmhdplop-0.9.6 66
+MD5 d299a1e7e66dda11ba9de3a6b183ca40 wmhdplop-0.9.7.ebuild 1345
+MD5 30b525e83915e738c53133e56ded8e10 ChangeLog 1311
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 0a55dceead9ad7a2f7205718807cc4df files/digest-wmhdplop-0.9.7 66
+MD5 2745de508ae424a95df9b4ec8cbd8a1a files/wmhdplop-cflags.patch 313
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild
index 901538867ca7..02af6aae948b 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild,v 1.1 2005/07/04 08:51:40 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://hules.free.fr/wmhdplop/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 DEPEND="virtual/x11
 	>=media-libs/imlib2-1.2.0-r2
@@ -25,6 +25,14 @@ src_unpack()
 
 	# Honour Gentoo CFLAGS, but retain some the package author chose himself
 	epatch ${FILESDIR}/${PN}-cflags.patch
+
+	if ! built_with_use imlib2 X; then
+		echo
+		eerror "This package depends on media-libs/imlib2, which needs"
+		eerror "to be compiled with 'X' USE flag enabled..."
+		echo
+		die
+	fi
 }
 
 src_compile()
diff --git a/x11-plugins/wmifinfo/ChangeLog b/x11-plugins/wmifinfo/ChangeLog
index 04cd5bda3120..8d14817a0f57 100644
--- a/x11-plugins/wmifinfo/ChangeLog
+++ b/x11-plugins/wmifinfo/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for x11-plugins/wmifinfo
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/ChangeLog,v 1.1 2004/01/04 04:28:48 port001 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> wmifinfo-0.09.ebuild:
+  Stable on ppc.
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmifinfo-0.09.ebuild:
+  Stable for x86.
+
+  25 Sep 2005; Luis Medinas <metalgod@gentoo.org> wmifinfo-0.09.ebuild:
+  Added ~amd64 keywords. Closes bug #107123
+
+*wmifinfo-0.09 (16 Aug 2005)
+
+  16 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmifinfo-0.09.ebuild:
+  Version bump. Closes #100811.
+
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmifinfo-0.06.ebuild:
+  Wiped out older version.
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> wmifinfo-0.08.ebuild:
+  Stable on ppc.
+
+  26 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmifinfo-0.08.ebuild:
+  Stable for x86.
+  wmifinfo-0.06.ebuild:
+  Update copyright headers...
+
+*wmifinfo-0.08 (01 Dec 2004)
+
+  01 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> wmifinfo-0.08.ebuild:
+  Version bump. Closes #72998. Added some magic sed to allow usage of
+  Gentoo's CFLAGS...
+  metadata.xml:
+  Properly assign to the desktop-dock herd...
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmifinfo-0.06.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmifinfo-0.06.ebuild:
+  Masked wmifinfo-0.06.ebuild stable for ppc
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> wmifinfo-0.06.ebuild:
+  Added to ~ppc.
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> wmifinfo-0.06.ebuild:
+  Marked stable.
 
 *wmifinfo-0.06 (04 Jan 2004)
 
diff --git a/x11-plugins/wmifinfo/Manifest b/x11-plugins/wmifinfo/Manifest
index 4f1b4f8ef802..45bcf55c28c6 100644
--- a/x11-plugins/wmifinfo/Manifest
+++ b/x11-plugins/wmifinfo/Manifest
@@ -1,2 +1,6 @@
-MD5 cadf1d3711cb5d7f2e125347ff662b20 wmifinfo-0.06.ebuild 548
-MD5 8b499bda1229220731879278323e9d00 files/digest-wmifinfo-0.06 61
+MD5 fd59aa359b1beb65e0c23033bcbf30f1 ChangeLog 1778
+MD5 f184b72a7fe8cc5213d5c1f17e9c008f files/digest-wmifinfo-0.08 61
+MD5 4c51754aea1b3076540c0b68fa4f1f79 files/digest-wmifinfo-0.09 61
+MD5 3926e20e1166bb22e2fa4c570adbff44 metadata.xml 173
+MD5 1688d06275cff9d49485a0513d5fd33f wmifinfo-0.08.ebuild 682
+MD5 7b0865a631df947ab7ea6a05f622fce0 wmifinfo-0.09.ebuild 689
diff --git a/x11-plugins/wmifinfo/metadata.xml b/x11-plugins/wmifinfo/metadata.xml
index 2518313f5241..ebfeafcdb873 100644
--- a/x11-plugins/wmifinfo/metadata.xml
+++ b/x11-plugins/wmifinfo/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild
index 5633fc418fbe..ec6a48955cf8 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild,v 1.1 2004/12/01 09:17:01 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.zevv.nl/wmifinfo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc"
 
 DEPEND="virtual/x11
 	>=sys-apps/sed-4"
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
index 8cb31218efbf..8598ad3d1f34 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild,v 1.1 2005/08/16 10:20:31 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.zevv.nl/wmifinfo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 DEPEND="virtual/x11
 	>=sys-apps/sed-4"
diff --git a/x11-plugins/wmifs/ChangeLog b/x11-plugins/wmifs/ChangeLog
index 105416217325..f79e3584a691 100644
--- a/x11-plugins/wmifs/ChangeLog
+++ b/x11-plugins/wmifs/ChangeLog
@@ -1,7 +1,52 @@
-# 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 $
+# ChangeLog for x11-plugins/wmifs
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmifs-1.3_beta1-r2.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> wmifs-1.3_beta1-r2.ebuild:
+  stable on ia64
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmifs-1.3_beta1-r2.ebuild:
+  Masked wmifs-1.3_beta1-r2.ebuild stable for ppc
+
+  23 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> -wmifs-1.3_beta1.ebuild:
+  Remove older ebuilds...
+
+  20 Aug 2004; Jason Wever <weeve@gentoo.org> wmifs-1.3_beta1-r2.ebuild:
+  Stable on sparc.
+
+*wmifs-1.3_beta1-r2 (01 Aug 2004)
+
+  01 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmifs-1.3_beta1-r2.ebuild:
+  New revision that honours Gentoo CFLAGS. Stable for x86. Didn't touch other
+  arch keywords as this change should not impact stability...
+  wmifs-1.3_beta1-r1.ebuild:
+  Remove older revision.
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> wmifs-1.3_beta1-r1.ebuild:
+  Stable on alpha.
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> wmifs-1.3_beta1-r1.ebuild:
+  Marking stable on hppa
+
+  27 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmifs-1.3_beta1-r1.ebuild:
+  Mark stable on amd64.
+
+*wmifs-1.3_beta1-r1 (01 Nov 2003)
+
+  01 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wmifs-1.3_beta1-r1.ebuild:
+  using the Debian patch which allows for longer interface names and prettifies
+  the output in wmifs for long names. Thanks to: Georgi Georgiev
+  <chutz@chubaka.net> in bug #26249
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmifs-1.3_beta1 (3 Feb 2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmifs/Manifest b/x11-plugins/wmifs/Manifest
index e69de29bb2d1..091eed409861 100644
--- a/x11-plugins/wmifs/Manifest
+++ b/x11-plugins/wmifs/Manifest
@@ -0,0 +1,4 @@
+MD5 59709abd1902947ff69278ed98695f30 wmifs-1.3_beta1-r2.ebuild 992
+MD5 e37a6c226a99c4b43337dd2c6520b3fd ChangeLog 2050
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 621ac5df8f68e7a031f263400bcdb086 files/digest-wmifs-1.3_beta1-r2 127
diff --git a/x11-plugins/wmifs/metadata.xml b/x11-plugins/wmifs/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmifs/metadata.xml
+++ b/x11-plugins/wmifs/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild b/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild
index acb8aac226be..bbfccc04e3ca 100644
--- a/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild
+++ b/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild,v 1.1 2004/07/31 22:24:35 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://linux.tucows.tierra.net/files/x11/dock/${PN}-${MY_PV}.tar.gz
 DEPEND="virtual/x11"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha hppa ~mips ~ia64 amd64"
+KEYWORDS="x86 ppc sparc alpha hppa ~mips ia64 amd64"
 
 src_unpack()
 {
@@ -39,5 +39,5 @@ src_install ()
 	insinto /usr/share/wmifs
 	doins sample.wmifsrc
 	cd ..
-	dodoc BUGS  CHANGES  COPYING  HINTS  INSTALL  README  TODO
+	dodoc BUGS  CHANGES  HINTS  README  TODO
 }
diff --git a/x11-plugins/wminet/ChangeLog b/x11-plugins/wminet/ChangeLog
index 8bfc6f93d4b0..5f090cfd0c50 100644
--- a/x11-plugins/wminet/ChangeLog
+++ b/x11-plugins/wminet/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-plugins/wminet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/ChangeLog,v 1.1 2002/10/03 17:42:44 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wminet-2.0.3.ebuild:
+  Masked wminet-2.0.3.ebuild stable for ppc
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wminet-2.0.3.ebuild:
+  add sed-4 dep
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> wminet-2.0.3.ebuild:
+  Added to ~ppc.
+
+  24 Sep 2003; Jason Wever <weeve@gentoo.org> wminet-2.0.3.ebuild:
+  Added ~sparc keyword.
 
 *wminet-2.0.3 (04 Oct 2002)
 
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
index e69de29bb2d1..b5b8068674fe 100644
--- a/x11-plugins/wminet/Manifest
+++ b/x11-plugins/wminet/Manifest
@@ -0,0 +1,4 @@
+MD5 7ff96ff75c78fac0e9cf038bef4ebf66 ChangeLog 786
+MD5 26032e82a4c490db4a66fe6d1936e1dd metadata.xml 371
+MD5 a5eef721a52e8522a3b2ddfc2d54a97a wminet-2.0.3.ebuild 858
+MD5 de78aee247c7915625d25e5df489c343 files/digest-wminet-2.0.3 63
diff --git a/x11-plugins/wminet/metadata.xml b/x11-plugins/wminet/metadata.xml
index eeb399bc11d7..3a06d36b09d0 100644
--- a/x11-plugins/wminet/metadata.xml
+++ b/x11-plugins/wminet/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wminet/wminet-2.0.3.ebuild b/x11-plugins/wminet/wminet-2.0.3.ebuild
index 0c63f306de40..3d9e475534c5 100644
--- a/x11-plugins/wminet/wminet-2.0.3.ebuild
+++ b/x11-plugins/wminet/wminet-2.0.3.ebuild
@@ -1,39 +1,32 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2002/10/03 17:42:44 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/wminet-2.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 S="${WORKDIR}/${PN}.app"
-
+IUSE=""
 DESCRIPTION="dockapp that displays useful server statistics"
 HOMEPAGE="http://www.neotokyo.org/illusion/dock_apps.html"
 SRC_URI="http://www.neotokyo.org/illusion/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc amd64 ppc"
 
-DEPEND="virtual/x11"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/x11
+	>=sys-apps/sed-4"
 
 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
@@ -45,5 +38,4 @@ src_install() {
 	insinto /etc/skel
 	insopts -m 600
 	newins wminetrc .wminetrc
-
 }
diff --git a/x11-plugins/wmitime/ChangeLog b/x11-plugins/wmitime/ChangeLog
index 2c971e2c8a2f..cff5aa84f3e2 100644
--- a/x11-plugins/wmitime/ChangeLog
+++ b/x11-plugins/wmitime/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for x11-plugins/wmitime
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/ChangeLog,v 1.1 2002/10/04 15:38:19 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmitime-0.3.ebuild:
+  Removed COPYING from dodoc.
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmitime-0.3.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmitime-0.3.ebuild:
+  Masked wmitime-0.3.ebuild stable for ppc
+
+  31 Aug 2004; Tom Gall <tgall@gentoo.org> wmitime-0.3.ebuild:
+  stable on ppc64, bug #61764
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmitime-0.3.ebuild:
+  glibc -> libc
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> wmitime-0.3.ebuild:
+  Added to ~ppc.
+
+  19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmitime-0.3.ebuild:
+  Inherit eutils.
 
 *wmitime-0.3 (04 Oct 2002)
 
diff --git a/x11-plugins/wmitime/Manifest b/x11-plugins/wmitime/Manifest
index e69de29bb2d1..b0e89d1728d1 100644
--- a/x11-plugins/wmitime/Manifest
+++ b/x11-plugins/wmitime/Manifest
@@ -0,0 +1,5 @@
+MD5 95824194b5787417c66a92a789845c9c wmitime-0.3.ebuild 776
+MD5 f01e5f513105b07e9dd462428fd352f8 ChangeLog 1059
+MD5 1a356f312f3f083697591fede9565f3a metadata.xml 362
+MD5 ed57078efdae8e33c0afccb712986490 files/digest-wmitime-0.3 62
+MD5 9b98c7ac42b6ab69fc38a9a1c8114253 files/makefile.diff 729
diff --git a/x11-plugins/wmitime/metadata.xml b/x11-plugins/wmitime/metadata.xml
index 318edcd0fd6e..266d9a84f83a 100644
--- a/x11-plugins/wmitime/metadata.xml
+++ b/x11-plugins/wmitime/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmitime/wmitime-0.3.ebuild b/x11-plugins/wmitime/wmitime-0.3.ebuild
index 4a1ae51ff774..a999a215d687 100644
--- a/x11-plugins/wmitime/wmitime-0.3.ebuild
+++ b/x11-plugins/wmitime/wmitime-0.3.ebuild
@@ -1,42 +1,36 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # 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.1 2002/10/04 15:38:19 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/wmitime-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
-S="${WORKDIR}/${PN}"
+inherit eutils
 
+S="${WORKDIR}/${PN}"
+IUSE=""
 DESCRIPTION="Overglorified clock dockapp w/time, date, and internet time"
 HOMEPAGE="http://www.neotokyo.org/illusion/"
 SRC_URI="http://www.neotokyo.org/illusion/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11"
-RDEPEND="${DEPEND}"
 
 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
-
+	dodoc BUGS CHANGES README
 }
diff --git a/x11-plugins/wmium/ChangeLog b/x11-plugins/wmium/ChangeLog
index e9722fe85227..30122699f8e0 100644
--- a/x11-plugins/wmium/ChangeLog
+++ b/x11-plugins/wmium/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for x11-plugins/wmium
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.1 2004/02/07 04:27:40 port001 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
+
+  18 Jul 2005; Daniel Black <dragonheart@gentoo.org> -wmium-1.0.9.ebuild,
+  wmium-1.0.9b.ebuild:
+  typo fix thanks to bug #99401 thanks to Michael Knight
+
+*wmium-1.0.9b (17 Jul 2005)
+
+  17 Jul 2005; Daniel Black <dragonheart@gentoo.org> +wmium-1.0.9b.ebuild:
+  version bump
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> wmium-1.0.9.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  01 Jun 2005; Daniel Black <dragonheart@gentoo.org> -wmium-1.0.7.ebuild,
+  -wmium-1.0.8.ebuild:
+  old version cleanout
+
+  12 Aug 2004; Daniel Black <dragonheart@gentoo.org> wmium-1.0.9.ebuild:
+  x86 stable
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> wmium-1.0.7.ebuild,
+  wmium-1.0.8.ebuild, wmium-1.0.9.ebuild:
+  Typo in DESCRIPTION: pluggin -> plugin. Bug 59717.
+
+  15 Jul 2004; Daniel Black <dragonheart@gentoo.org> wmium-1.0.9.ebuild:
+  fixed S= dir according to bug #56012. Thanks to Michael Knight
+  <jedimike@gmail.com>
+
+*wmium-1.0.9 (03 Jul 2004)
+
+  03 Jul 2004; <pyrania@gentoo.org> +wmium-1.0.9.ebuild:
+  Version bump. Closing bug #55884.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmium-1.0.7.ebuild,
+  wmium-1.0.8.ebuild:
+  glibc -> libc
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmium-1.0.7.ebuild,
+  wmium-1.0.8.ebuild:
+  QA - add error checking, clean up, fix use invocation
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmium-1.0.7.ebuild,
+  wmium-1.0.8.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmium-1.0.8.ebuild:
+  Removing S=
+
+*wmium-1.0.8 (05 Mar 2004)
+
+  05 Mar 2004; Daniel Black <dragonheart@gentoo.org> wmium-1.0.7.ebuild,
+  wmium-1.0.8.ebuild:
+  Version bump. unmask for x86 and small documentation fix
 
 *wmium-1.0.7 (07 Feb 2004)
 
diff --git a/x11-plugins/wmium/Manifest b/x11-plugins/wmium/Manifest
index 66dff2047a8e..3018990bd296 100644
--- a/x11-plugins/wmium/Manifest
+++ b/x11-plugins/wmium/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8c8cbf007e24732a84b706a8cf701979 ChangeLog 2269
 MD5 75bf1a2523c837fdd89f903e4b8252a4 metadata.xml 385
-MD5 7ab5e2568a228a7c552b4b2141140741 wmium-1.0.7.ebuild 1371
-MD5 a28cfb228722a63f4df03df742fc1b70 ChangeLog 377
-MD5 1be5e52a4c5ffe5723f22d0070ef8dbb files/digest-wmium-1.0.7 62
+MD5 9e47f72279a569c74d6aaffe78cbdb2e wmium-1.0.9b.ebuild 1297
+MD5 e420d58fe2bc90bec34c26a6e31cc60b files/digest-wmium-1.0.9b 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC27PsmdTrptrqvGERAt6DAJ9ylb4vcBmTWafWgtUnNLqdmSIYzgCfakqX
+DovI6NnXEkIvlN24cZHEfKY=
+=ZT0M
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmium/wmium-1.0.9b.ebuild b/x11-plugins/wmium/wmium-1.0.9b.ebuild
index 4ea9903232e4..4a39a2398ace 100644
--- a/x11-plugins/wmium/wmium-1.0.9b.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.9b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b.ebuild,v 1.1 2005/07/17 00:51:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
 IUSE="gtk"
 
@@ -10,7 +10,6 @@ SRC_URI="http://www.earthmagic.org/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-S=${WORKDIR}/${PN}
 DEPEND="virtual/libc
 	virtual/x11
 	media-libs/xpm
diff --git a/x11-plugins/wmix/ChangeLog b/x11-plugins/wmix/ChangeLog
index f4df764b6f1a..5d6912f7c079 100644
--- a/x11-plugins/wmix/ChangeLog
+++ b/x11-plugins/wmix/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for x11-plugins/wmix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.1 2002/09/16 16:20:23 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmix-3.1-r1.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+*wmix-3.1-r1 (19 Jul 2004)
+
+  19 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmix-3.1-r1.ebuild:
+  New ebuild with patch to correct version number, plus new fixed and
+  updated man page. Fixes #56270, reported by Jan Rychter.
+  wmix-3.1.ebuild:
+  Remove old ebuild.
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmix-3.0-1.ebuild:
+  Removing old ebuild, it doesn't work on 2.6 kernels...
+
+  06 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmix-3.1.ebuild:
+  Stable on x86.
+
+*wmix-3.1 (03 Jul 2004)
+
+  03 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmix-3.1.ebuild:
+  Version Bump.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmix-3.0-r1.ebuild:
+  add sed-4 dep
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> wmix-3.0-r1.ebuild:
+  Added to ~ppc.
+
+  03 Oct 2003; Jason Wever <weeve@gentoo.org> wmix-3.0-r1.ebuild:
+  Added ~sparc keyword.
 
 *wmix-3.0-r1 (1 Feb 2002)
 
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index e69de29bb2d1..ac246462d6f7 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -0,0 +1,6 @@
+MD5 1dca4cbec3e5388fab6d296deae2c15a wmix-3.1-r1.ebuild 916
+MD5 ea8ce41ec251d39bf3be80ab679622b7 ChangeLog 1725
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 781977617f85fb58342bc62e24baa6f2 files/fix-wmix-3.1-version-number.patch 277
+MD5 e8c2db20d30dd92cc219e4364aaf7830 files/wmix.1 1969
+MD5 ad16349941063942ee420bd1937e8ad0 files/digest-wmix-3.1-r1 59
diff --git a/x11-plugins/wmix/metadata.xml b/x11-plugins/wmix/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmix/metadata.xml
+++ b/x11-plugins/wmix/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmix/wmix-3.1-r1.ebuild b/x11-plugins/wmix/wmix-3.1-r1.ebuild
index d7134301e813..d710d6b2d7a8 100644
--- a/x11-plugins/wmix/wmix-3.1-r1.ebuild
+++ b/x11-plugins/wmix/wmix-3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/wmix-3.1-r1.ebuild,v 1.1 2004/07/19 09:22:11 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/wmix-3.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 inherit eutils
 
@@ -38,5 +38,5 @@ src_install ()
 	# Original manpage does not work, we provide a fixed (and updated) one
 	doman ${FILESDIR}/wmix.1
 
-	dodoc README COPYING INSTALL NEWS BUGS AUTHORS sample.wmixrc
+	dodoc README NEWS BUGS AUTHORS sample.wmixrc
 }
diff --git a/x11-plugins/wmjsql/ChangeLog b/x11-plugins/wmjsql/ChangeLog
index 977187cefa3c..78d4e5ccfd8c 100644
--- a/x11-plugins/wmjsql/ChangeLog
+++ b/x11-plugins/wmjsql/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-plugins/wmjsql
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/ChangeLog,v 1.1 2004/07/17 02:07:08 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmjsql-0.5.ebuild:
+  Removed INSTALL from dodoc.
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmjsql-0.5.ebuild:
+  Added ~sparc keyword.
+
+  21 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmjsql-0.5.ebuild:
+  Remove unneeded 'inherit eutils'...
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmjsql-0.5.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmjsql-0.5.ebuild:
+  Masked wmjsql-0.5.ebuild stable for ppc
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> wmjsql-0.5.ebuild:
+  Added to ~ppc.
 
 *wmjsql-0.5 (17 Jul 2004)
 
diff --git a/x11-plugins/wmjsql/Manifest b/x11-plugins/wmjsql/Manifest
index a6ae94f9e332..0032cc13f3b6 100644
--- a/x11-plugins/wmjsql/Manifest
+++ b/x11-plugins/wmjsql/Manifest
@@ -1,3 +1,5 @@
-MD5 2e81425daa443ab7da99fabc84e99dfc wmjsql-0.5.ebuild 686
+MD5 8be45720ea5e22c8c2d0459a85879b52 wmjsql-0.5.ebuild 787
+MD5 4a1fe9be4791608d37fc11557e323502 ChangeLog 964
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 647835ae3e284a134ea3f0e57ab45438 files/wmjsql.desktop 165
 MD5 33c679afbad883b5bb53cb9e67430b77 files/digest-wmjsql-0.5 61
diff --git a/x11-plugins/wmjsql/wmjsql-0.5.ebuild b/x11-plugins/wmjsql/wmjsql-0.5.ebuild
index fbc721155cad..55443a1f9182 100644
--- a/x11-plugins/wmjsql/wmjsql-0.5.ebuild
+++ b/x11-plugins/wmjsql/wmjsql-0.5.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/wmjsql-0.5.ebuild,v 1.1 2004/07/17 02:07:08 s4t4n Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/wmjsql-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 IUSE=""
 
@@ -18,7 +16,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~sparc"
 
 src_compile() {
 	cd ${S}/src
@@ -32,7 +30,7 @@ src_install() {
 	newdoc conf sample.wmjsql
 
 	cd ${S}
-	dodoc CREDITS INSTALL README TODO
+	dodoc CREDITS README TODO
 
 	insinto /usr/share/applications
 	doins ${FILESDIR}/${PN}.desktop
diff --git a/x11-plugins/wmlaptop/ChangeLog b/x11-plugins/wmlaptop/ChangeLog
index ea3ba9617ca7..513a02762b20 100644
--- a/x11-plugins/wmlaptop/ChangeLog
+++ b/x11-plugins/wmlaptop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmlaptop
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.1 2004/07/17 21:06:44 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  wmlaptop-1.3.ebuild:
+  mark ~ppc
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmlaptop-1.3.ebuild:
+  Stable for x86.
 
 *wmlaptop-1.3 (17 Jul 2004)
 
diff --git a/x11-plugins/wmlaptop/Manifest b/x11-plugins/wmlaptop/Manifest
index bcf3708f1492..4b3c47ac3c69 100644
--- a/x11-plugins/wmlaptop/Manifest
+++ b/x11-plugins/wmlaptop/Manifest
@@ -1,3 +1,5 @@
-MD5 461da43a87f1f0bcfcf782b0bed45a8c wmlaptop-1.3.ebuild 698
-MD5 52c5fb0171548d186357ef1f1f0e768b files/wmlaptop.desktop 174
+MD5 e0b7139d76b6e763c4941e0d7427b7e3 ChangeLog 564
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 b62efe5d755d08064838b1ca431923a5 wmlaptop-1.3.ebuild 794
 MD5 c823cd1d37e96a8be63985398723429f files/digest-wmlaptop-1.3 64
+MD5 52c5fb0171548d186357ef1f1f0e768b files/wmlaptop.desktop 174
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
index c6b86f7374f0..0a30748c2727 100644
--- a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.1 2004/07/17 21:06:44 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ RDEPEND=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 src_compile() {
 	cd ${S}
diff --git a/x11-plugins/wmload/ChangeLog b/x11-plugins/wmload/ChangeLog
index 0d804a70ad34..fc2c793b8238 100644
--- a/x11-plugins/wmload/ChangeLog
+++ b/x11-plugins/wmload/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-plugins/wmload
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.1 2004/07/17 01:46:38 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmload-0.9.2.ebuild:
+  Added ~sparc keyword.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmload-0.9.2.ebuild:
+  Stable for x86.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmload-0.9.2.ebuild:
+  Masked wmload-0.9.2.ebuild stable for ppc
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> wmload-0.9.2.ebuild:
+  Added to ~ppc.
 
 *wmload-0.9.2 (17 Jul 2004)
 
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
index 4ebf1202d33c..c1b1025b49f0 100644
--- a/x11-plugins/wmload/Manifest
+++ b/x11-plugins/wmload/Manifest
@@ -1,4 +1,6 @@
-MD5 61f447dd88e5d49e78e57c49a31ee1f1 wmload-0.9.2.ebuild 858
-MD5 59da1f6d83d13b12b1c5c7272eb5bc2f files/wmload.desktop 178
+MD5 9a990081c0b789a093d4f1035d82ce9b ChangeLog 767
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 82774df8dc118af39a46a972120310a5 wmload-0.9.2.ebuild 949
 MD5 48ace595b459d1ad5e49cc691a10a8a6 files/digest-wmload-0.9.2 59
 MD5 06a3a2f0d4e6d6c4cdc20eb85b568957 files/wmload-ComplexProgramTargetNoMan.patch 224
+MD5 59da1f6d83d13b12b1c5c7272eb5bc2f files/wmload.desktop 178
diff --git a/x11-plugins/wmload/wmload-0.9.2.ebuild b/x11-plugins/wmload/wmload-0.9.2.ebuild
index a5582e82e299..31fc5b3c457f 100644
--- a/x11-plugins/wmload/wmload-0.9.2.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild,v 1.1 2004/07/17 01:46:38 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~sparc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmlongrun/ChangeLog b/x11-plugins/wmlongrun/ChangeLog
index 646ea6d71c5e..9e4851d9ccbf 100644
--- a/x11-plugins/wmlongrun/ChangeLog
+++ b/x11-plugins/wmlongrun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmlongrun
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/ChangeLog,v 1.1 2004/07/17 14:24:57 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/ChangeLog,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmlongrun-0.2.0.ebuild:
+  removed COPYING from dodoc.
+
+  29 Sep 2004; <pyrania@gentoo.org> wmlongrun-0.2.0.ebuild:
+  Marked stable on x86.
 
 *wmlongrun-0.2.0 (17 Jul 2004)
 
diff --git a/x11-plugins/wmlongrun/Manifest b/x11-plugins/wmlongrun/Manifest
index 1afb83768984..dd44a0249f8b 100644
--- a/x11-plugins/wmlongrun/Manifest
+++ b/x11-plugins/wmlongrun/Manifest
@@ -1,2 +1,4 @@
-MD5 bedfdb6914b6d6187fbf8ac48a1452d5 wmlongrun-0.2.0.ebuild 732
+MD5 097b78d42324f12332d8e11511c2f82e wmlongrun-0.2.0.ebuild 828
+MD5 5106ebf56b737e1b7c09ebf8d72fca97 ChangeLog 570
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 b7c113e58dd30a7bc0d3d8a802a2ec80 files/digest-wmlongrun-0.2.0 66
diff --git a/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild b/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
index c5729fa7de1f..9d9b61d7a905 100644
--- a/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
+++ b/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild,v 1.1 2004/07/17 14:24:57 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 DESCRIPTION="A dockapp to monitor LongRun on a Transmeta Crusoe processor"
 HOMEPAGE="http://www.sh.rim.or.jp/~ssato/dockapp/index.shtml"
@@ -12,7 +12,7 @@ IUSE=""
 
 # Since this will only work with a Crusoe processor, it's safe to assume that
 # the functionality is only available on x86.
-KEYWORDS="~x86 -*"
+KEYWORDS="x86 -*"
 
 src_compile() {
 	econf || die "Configuration failed"
@@ -21,5 +21,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die "Installation failed"
-	dodoc README AUTHORS TODO COPYING MAKEDEV-cpuid-msr
+	dodoc README AUTHORS TODO MAKEDEV-cpuid-msr
 }
diff --git a/x11-plugins/wmlpq/ChangeLog b/x11-plugins/wmlpq/ChangeLog
index 52cd2432af27..e5d936a485f6 100644
--- a/x11-plugins/wmlpq/ChangeLog
+++ b/x11-plugins/wmlpq/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-plugins/wmlpq
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/ChangeLog,v 1.1 2004/07/17 16:17:37 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+*wmlpq-0.2.1-r1 (26 Sep 2005)
+
+  26 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> wmlpq-0.2.1-r1.ebuild:
+  Revision bump, directly as stable, updating libdockapp dependancy. Closes bug #105530.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmlpq-0.2.1.ebuild:
+  Masked wmlpq-0.2.1.ebuild stable for ppc
+
+  31 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmlpq-0.2.1.ebuild:
+  Stable for x86...
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmlpq-0.2.1.ebuild:
+  Added to ~ppc.
 
 *wmlpq-0.2.1 (17 Jul 2004)
 
diff --git a/x11-plugins/wmlpq/Manifest b/x11-plugins/wmlpq/Manifest
index dda36b190c8d..525613f7ce02 100644
--- a/x11-plugins/wmlpq/Manifest
+++ b/x11-plugins/wmlpq/Manifest
@@ -1,6 +1,6 @@
-MD5 0a740f98d5a8d6e0a5d33a016b98f286 ChangeLog 369
+MD5 90d8109700ece9f60d629f9d7c9f0abe wmlpq-0.2.1-r1.ebuild 858
+MD5 0f64a437d2ea903a4d6f38b9ca9fadac ChangeLog 863
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 04b29e86a447cbd851e9b1fa2574e43d wmlpq-0.2.1.ebuild 757
-MD5 252e5c37fbfd0eac7b99916e103969c7 files/digest-wmlpq-0.2.1 62
 MD5 8ea4c603864c79bb5e2fe53fd8ea8ecc files/wmlpq.desktop 177
 MD5 e17f31b733e83d2e340ba8273889b0e8 files/wmlpq-makefile.patch 740
+MD5 252e5c37fbfd0eac7b99916e103969c7 files/digest-wmlpq-0.2.1-r1 62
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
index 8fad5a6de0a8..72a2670c8a7f 100644
--- a/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
+++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild,v 1.1 2005/09/26 10:44:09 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 inherit eutils
 
diff --git a/x11-plugins/wmmail/ChangeLog b/x11-plugins/wmmail/ChangeLog
index f42c9d034821..7fca3b0daf82 100644
--- a/x11-plugins/wmmail/ChangeLog
+++ b/x11-plugins/wmmail/ChangeLog
@@ -1,9 +1,43 @@
 # 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 $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmail-0.64-r3.ebuild:
+  Removed COPYING from dodoc.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmail-0.64-r3.ebuild:
+  Masked wmmail-0.64-r3.ebuild stable for ppc
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> wmmail-0.64-r3.ebuild:
+  Added to ~ppc.
+
+*wmmail-0.64-r3 (05 Jun 2003)
+
+  05 Jun 2003; robh <robh@gentoo.org> wmmail-0.64-r1.ebuild,
+  wmmail-0.64-r2.ebuild, wmmail-0.64-r3.ebuild, wmmail-0.64.ebuild:
+  fixed /usr/share/GNUstep sillyness.
+
+*wmmail-0.64-r2 (21 May 2003)
+
+  21 May 2003; Christian Birchinger <joker@gentoo.org> wmmail-0.64-r2.ebuild:
+  Synched Appspath with WindowMaker
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*wmmail-0.64-r1 (07-Feb-2002)
+  
+  07 Sept 2002; Brad Cowan <bradlyatc@cowancomputers.com> 
+  wmmail-0.64-r1.ebuild files/digest-wmmail-0.64-r1 ChangeLog :
+
+  reworked ebuild -- symlink, beautification. (into cvs by seemant)
 
 *wmmail-0.64 (19-Feb-2002)
 
+  13 Sep 2002; Brandon Low <lostlogic@gentoo.org> wmmail-0.64.ebuild :
+
+  This ebuild was broken beyond belief (SRC_URI wise), now it isn't :).
+
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/wmmail/Manifest b/x11-plugins/wmmail/Manifest
index 530c7b9511da..bbc022dd1f35 100644
--- a/x11-plugins/wmmail/Manifest
+++ b/x11-plugins/wmmail/Manifest
@@ -1,7 +1,4 @@
-MD5 cbde201ca94c029ae655da7ae2540e3e ChangeLog 1035
-MD5 223afcef3e48f23c5ecb2e9ef8946e72 wmmail-0.64-r1.ebuild 801
-MD5 d35f1b7389609b10ec13b1d0c2734528 wmmail-0.64.ebuild 931
-MD5 c78dbb3e4e92167cea045680da2a95d0 wmmail-0.64-r2.ebuild 941
-MD5 309ba0a590c1fa19b86bdf0190e654ec files/digest-wmmail-0.64 67
-MD5 309ba0a590c1fa19b86bdf0190e654ec files/digest-wmmail-0.64-r1 67
-MD5 309ba0a590c1fa19b86bdf0190e654ec files/digest-wmmail-0.64-r2 67
+MD5 95ee4937114ccec0044db45351de00fa wmmail-0.64-r3.ebuild 938
+MD5 360df2cc7f9956baee1f644198927215 ChangeLog 1549
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 309ba0a590c1fa19b86bdf0190e654ec files/digest-wmmail-0.64-r3 67
diff --git a/x11-plugins/wmmail/metadata.xml b/x11-plugins/wmmail/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmmail/metadata.xml
+++ b/x11-plugins/wmmail/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmmail/wmmail-0.64-r3.ebuild b/x11-plugins/wmmail/wmmail-0.64-r3.ebuild
index be4c327a952e..8201816fcfa1 100644
--- a/x11-plugins/wmmail/wmmail-0.64-r3.ebuild
+++ b/x11-plugins/wmmail/wmmail-0.64-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/wmmail-0.64-r3.ebuild,v 1.1 2003/06/05 00:35:55 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/wmmail-0.64-r3.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
+IUSE=""
 MY_PN=WMMail.app
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -11,7 +12,7 @@ SRC_URI="http://www.eecg.utoronto.ca/~chanb/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
+KEYWORDS="x86 sparc amd64 ppc"
 
 DEPEND="virtual/x11
 	x11-libs/libPropList"
@@ -26,6 +27,6 @@ src_install () {
 	make DESTDIR=${D} install
 	dodir /usr/bin
 	dosym /usr/lib/GNUstep/${MY_PN}/WMMail /usr/bin/wmmail
-	dodoc AUTHORS COPYING NEWS README doc/Help.txt
+	dodoc AUTHORS NEWS README doc/Help.txt
 	newman/wmmail.man wmmail.1
 }
diff --git a/x11-plugins/wmmaiload/ChangeLog b/x11-plugins/wmmaiload/ChangeLog
index 7d7d903717a9..20c9d2e35eab 100644
--- a/x11-plugins/wmmaiload/ChangeLog
+++ b/x11-plugins/wmmaiload/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for x11-plugins/wmmaiload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.1 2002/10/29 07:05:56 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
+
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmmaiload-1.0.1.ebuild:
+  Wiped out older version.
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmmaiload-1.0.2.ebuild:
+  Stable on ppc.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> wmmaiload-1.0.2.ebuild:
+  stable on amd64
+
+  29 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmmaiload-1.0.2.ebuild:
+  Stable for x86. Fix copyright headers.
+  wmmaiload-1.0.1.ebuild:
+  Fix copyright headers.
+
+*wmmaiload-1.0.2 (06 Dec 2004)
+
+  06 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> wmmaiload-1.0.2.ebuild:
+  Version bump. Closes #73386.
+  wmmaiload-1.0.1.ebuild:
+  Added gtk+ dependency as it is needed by wmmaiload-config.
+  wmmaiload-0.6.0.ebuild:
+  Wipe out older ebuild.
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmmaiload-1.0.1.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmmaiload-1.0.1.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmaiload-0.6.0.ebuild, wmmaiload-1.0.1.ebuild:
+  Masked wmmaiload-1.0.1.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmaiload-0.6.0.ebuild:
+  Masked wmmaiload-0.6.0.ebuild stable for ppc
+
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org>; wmmaiload-1.0.1.ebuild:
+  Stable for x86.
+
+*wmmaiload-1.0.1 (04 Jul 2004)
+
+  04 Jul 2004; Michele Noberasco <s4t4n@gentoo.org>; wmmaiload-1.0.1.ebuild:
+  Version bump.
+  wmmaiload-0.10.0.ebuild:
+  Clean up old masked versions...
+
+  12 May 2004; Daniel Ahlberg <aliz@gentoo.org> wmmaiload-0.10.0.ebuild:
+  Removed S=.
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmmaiload-0.10.0.ebuild,
+  wmmaiload-0.6.0.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
+
+  22 Mar 2004; Don Seiler <rizzo@gentoo.org>; wmmaiload-0.10.0.ebuild:
+  Using dockapps.org mirror, as author's site seems to be down.
+
+*wmmaiload-0.10.0 (21 Mar 2004)
+
+  21 Mar 2004; Don Seiler <rizzo@gentoo.org>; wmmaiload-0.10.0.ebuild:
+  Version bump
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> wmmaiload-0.6.0.ebuild:
+  Added to ~ppc.
+
+  12 Jun 2003; <msterret@gentoo.org> wmmaiload-0.6.0.ebuild:
+  add Header
 
 *wmmaiload-0.6.0 (29 Oct 2002)
 
diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index e69de29bb2d1..6422b66f26e8 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -0,0 +1,4 @@
+MD5 eadd7c7d94f28ac743760a715b20e48c wmmaiload-1.0.2.ebuild 670
+MD5 a9d17ad6099d1dab7bcd034430455ff0 ChangeLog 2577
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 fc026ca9b740830ddbad29f6e52b6983 files/digest-wmmaiload-1.0.2 67
diff --git a/x11-plugins/wmmaiload/metadata.xml b/x11-plugins/wmmaiload/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmmaiload/metadata.xml
+++ b/x11-plugins/wmmaiload/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
index 29f114a32c39..c3049c5eaa73 100644
--- a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.1 2004/12/06 10:13:05 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:36 chriswhite Exp $
 
 DESCRIPTION="dockapp that monitors one or more mailboxes."
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ppc ~sparc"
 LICENSE="GPL-2"
 
 DEPEND="virtual/x11
diff --git a/x11-plugins/wmmemfree/ChangeLog b/x11-plugins/wmmemfree/ChangeLog
index 1f254f42374e..e99cddf3ed25 100644
--- a/x11-plugins/wmmemfree/ChangeLog
+++ b/x11-plugins/wmmemfree/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for x11-plugins/wmmemfree
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.1 2004/07/03 23:02:36 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-r1.ebuild:
+  Removed INSTALL and COPYING from dodoc.
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmmemfree-0.7-r1.ebuild:
+  Added ~sparc keyword.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-r1.ebuild:
+  Stable for x86.
+  wmmemfree-0.7.ebuild:
+  Remove old ebuild.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmmemfree-0.7-r1.ebuild:
+  stable on ppc64, bug #62256
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmemfree-0.7-r1.ebuild, wmmemfree-0.7.ebuild:
+  Masked wmmemfree-0.7.ebuild stable for ppc
+
+*wmmemfree-0.7-r1 (02 Sep 2004)
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmemfree-0.7-r1.ebuild:
+  Masked wmmemfree-0.7-r1.ebuild stable for ppc
+
+*wmmemfree-0.7-1 (28 Aug 2004)
+
+  28 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-1.ebuild:
+  New revision with 2.6 kernel support...
+
+  04 Jul 2004; David Holm <dholm@gentoo.org> wmmemfree-0.7.ebuild:
+  Added to ~ppc.
 
 *wmmemfree-0.7 (04 Jul 2004)
 
diff --git a/x11-plugins/wmmemfree/Manifest b/x11-plugins/wmmemfree/Manifest
index d89ccef45f1b..562cb835a771 100644
--- a/x11-plugins/wmmemfree/Manifest
+++ b/x11-plugins/wmmemfree/Manifest
@@ -1,4 +1,5 @@
-MD5 bca1eb9d1b9550042bfbcf10b3208b97 ChangeLog 245
+MD5 3608dad37d8cd58373c7c8a05b4a371b wmmemfree-0.7-r1.ebuild 810
+MD5 6555fa28936af33089f1924546ce4434 ChangeLog 1351
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 6123333066a5d793f5e406ec78fd6102 wmmemfree-0.7.ebuild 650
-MD5 549f2f0157314bd869f2a99bf0cb24f6 files/digest-wmmemfree-0.7 65
+MD5 549f2f0157314bd869f2a99bf0cb24f6 files/digest-wmmemfree-0.7-r1 65
+MD5 c06730f486985901cfe649e2236115dd files/wmmemfree-0.7-add-kernel-26-support.patch 2480
diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
index bf06fa52b66a..852fcd24e9bb 100644
--- a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
+++ b/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.1 2004/08/28 21:29:27 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ibiblio.org/pub/linux/X11/xutils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ppc64 ~sparc"
 
 DEPEND="virtual/x11"
 
@@ -33,5 +33,5 @@ src_install()
 {
 	dobin wmmemfree
 	doman wmmemfree.1
-	dodoc ChangeLog TODO WMS COPYING INSTALL README THANKS
+	dodoc ChangeLog TODO WMS README THANKS
 }
diff --git a/x11-plugins/wmmemload/ChangeLog b/x11-plugins/wmmemload/ChangeLog
index 38f7f10bf203..6f3c7d53c964 100644
--- a/x11-plugins/wmmemload/ChangeLog
+++ b/x11-plugins/wmmemload/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for x11-plugins/wmmemload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.1 2002/10/04 19:08:50 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmmemload-0.1.6.ebuild:
+  Mark 0.1.6 stable on alpha
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> wmmemload-0.1.6.ebuild:
+  ~alpha keyword, bug 78659.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmmemload-0.1.6.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmmemload-0.1.6.ebuild:
+  stable on ppc64, bug #62257
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmemload-0.1.5.ebuild, wmmemload-0.1.6.ebuild:
+  Masked wmmemload-0.1.6.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmemload-0.1.5.ebuild:
+  Masked wmmemload-0.1.5.ebuild stable for ppc
+
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmmemload-0.1.6.ebuild:
+  Stable on x86.
+
+*wmmemload-0.1.6 (03 Jul 2004)
+
+  03 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmmemload-0.1.6.ebuild:
+  Version bump.
+  wmmemload-0.1.4.ebuild:
+  Remove old ebuilds.
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmmemload-0.1.4.ebuild,
+  wmmemload-0.1.5.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> wmmemload-0.1.5.ebuild:
+  Added to ~ppc.
+
+*wmmemload-0.1.5 (15 Oct 2003)
+
+  15 Oct 2003; Nick Hadaway <raker@gentoo.org> wmmemload-0.1.5.ebuild:
+  Version bump which addresses bug #25475.
+
+  24 Sep 2003; Jason Wever <weeve@gentoo.org> wmmemload-0.1.4.ebuild:
+  Added ~sparc keyword.
 
 *wmmemload-0.1.4 (04 Oct 2002)
 
diff --git a/x11-plugins/wmmemload/Manifest b/x11-plugins/wmmemload/Manifest
index e69de29bb2d1..bb7e7f775005 100644
--- a/x11-plugins/wmmemload/Manifest
+++ b/x11-plugins/wmmemload/Manifest
@@ -0,0 +1,6 @@
+MD5 fb2864fb428edf1726af9a50b45cb84a metadata.xml 344
+MD5 36ac2eeb8d44eaf33eb9ea52feeedd69 ChangeLog 1844
+MD5 8755638c1a9dc5b565e07e7fac6f2efd wmmemload-0.1.5.ebuild 630
+MD5 7ce0c9db0e2a7b7f814e054c950a28e0 wmmemload-0.1.6.ebuild 638
+MD5 87c53da6317e5d6469ad5aaca7a24cbc files/digest-wmmemload-0.1.6 67
+MD5 ad8eaca5b428d4f6236e9d707186c304 files/digest-wmmemload-0.1.5 67
diff --git a/x11-plugins/wmmemload/metadata.xml b/x11-plugins/wmmemload/metadata.xml
index a5365992e3c1..6ae0774c9ea7 100644
--- a/x11-plugins/wmmemload/metadata.xml
+++ b/x11-plugins/wmmemload/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
index 90823b7a8863..871534b2e623 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild,v 1.1 2003/10/16 06:56:39 raker Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="dockapp that displays memory and swap space usage."
 SRC_URI="http://www.markstaggs.net/wmmemload/${P}.tar.gz"
 HOMEPAGE="http://www.markstaggs.net/"
 
 SLOT="0"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="x86 ~sparc amd64 ppc"
 LICENSE="GPL-2"
 
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
index aebd0b29ec87..702757d66478 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild,v 1.1 2004/07/03 02:36:40 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that displays memory and swap space usage."
@@ -8,7 +8,7 @@ SRC_URI="http://www.markstaggs.net/wmmemload/${P}.tar.gz"
 HOMEPAGE="http://www.markstaggs.net/"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 LICENSE="GPL-2"
 
 DEPEND="virtual/x11"
diff --git a/x11-plugins/wmmemmon/ChangeLog b/x11-plugins/wmmemmon/ChangeLog
index 01578b942b89..27804ba745d3 100644
--- a/x11-plugins/wmmemmon/ChangeLog
+++ b/x11-plugins/wmmemmon/ChangeLog
@@ -1,7 +1,42 @@
 # ChangeLog for x11-plugins/wmmemmon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.1 2002/10/03 15:29:25 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmmemmon-1.0.1.ebuild:
+  Mark 1.0.1 stable on alpha
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> wmmemmon-1.0.1.ebuild:
+  Stable on ppc64
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> wmmemmon-1.0.1.ebuild:
+  ~alpha keyword, bug 78660.
+
+  23 Dec 2004; Markus Rothe <corsair@gentoo.org> wmmemmon-1.0.1.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #74952
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmmemmon-1.0.1.ebuild:
+  Masked wmmemmon-1.0.1.ebuild stable for ppc
+
+  03 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmmemmon-0.7.0.ebuild:
+  Remove old ebuilds...
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmmemmon-0.7.0.ebuild,
+  wmmemmon-1.0.1.ebuild:
+  glibc -> libc
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmmemmon-0.7.0.ebuild,
+  wmmemmon-1.0.1.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
+
+*wmmemmon-1.0.1 (16 Oct 2003)
+
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> wmmemmon-1.0.1.ebuild:
+  Version bump.  A fix for 2.6 kernels among other things.  See bug 
+  #25475
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmmemmon-0.7.0 (04 Oct 2002)
 
   04 Oct 2002; Nick Hadaway <raker@gentoo.org> wmmemmon-0.7.0.ebuild,
diff --git a/x11-plugins/wmmemmon/Manifest b/x11-plugins/wmmemmon/Manifest
index e69de29bb2d1..e0f820f3a95c 100644
--- a/x11-plugins/wmmemmon/Manifest
+++ b/x11-plugins/wmmemmon/Manifest
@@ -0,0 +1,4 @@
+MD5 5fa4588139595046ad0fbf1623ddba40 metadata.xml 623
+MD5 e4be1c45582a6c2ef6349c268c8c10e9 ChangeLog 1569
+MD5 c14b42316a519e62b0dd99f1762a453d wmmemmon-1.0.1.ebuild 766
+MD5 857eb8c9ba9823482749d4e34f1d80aa files/digest-wmmemmon-1.0.1 66
diff --git a/x11-plugins/wmmemmon/metadata.xml b/x11-plugins/wmmemmon/metadata.xml
index 98438d941bb5..c6041af8c4bb 100644
--- a/x11-plugins/wmmemmon/metadata.xml
+++ b/x11-plugins/wmmemmon/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild b/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
index e9a9197087ff..a5493c0ea281 100644
--- a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
+++ b/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.1 2003/10/16 07:02:44 raker Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="A program to monitor memory/swap usages."
 SRC_URI="http://www.sh.rim.or.jp/~ssato/src/${P}.tar.gz"
 HOMEPAGE="http://www.sh.rim.or.jp/~ssato/dockapp/index.shtml#wmmemmon"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 SLOT="0"
 
-DEPEND="virtual/glibc x11-base/xfree"
+DEPEND="virtual/libc virtual/x11"
 
 src_compile() {
 
diff --git a/x11-plugins/wmmenu/ChangeLog b/x11-plugins/wmmenu/ChangeLog
index bceafded97e8..a16bcd3d81ff 100644
--- a/x11-plugins/wmmenu/ChangeLog
+++ b/x11-plugins/wmmenu/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-plugins/wmmenu
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmenu/ChangeLog,v 1.1 2004/12/22 11:13:29 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmenu/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmenu-1.2-r1.ebuild:
+  Removed COPYING from dodoc.
+
+  27 Sep 2005; Luis Medinas <metalgod@gentoo.org> wmmenu-1.2-r1.ebuild:
+  Added ~amd64 keyword. Closes bug #107121.
+
+  26 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> wmmenu-1.2-r1.ebuild:
+  Apparently this works nicely enough with whatever version of libdockapp :-(
+
+*wmmenu-1.2-r1 (26 Sep 2005)
+
+  26 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> wmmenu-1.2-r1.ebuild:
+  Revision bump, directly as stable, updating libdockapp dependancy. Closes bug #105530.
+  wmmenu-1.2.ebuild:
+  Wiped out older version.
+
+  24 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmmenu-1.2.ebuild:
+  Fix Copyright header. Stable for x86.
 
 *wmmenu-1.2 (22 Dec 2004)
 
diff --git a/x11-plugins/wmmenu/Manifest b/x11-plugins/wmmenu/Manifest
index 2d0c26550564..a54805f3fe74 100644
--- a/x11-plugins/wmmenu/Manifest
+++ b/x11-plugins/wmmenu/Manifest
@@ -1,6 +1,6 @@
-MD5 7c4718938e855d4877eaed53fd89c291 wmmenu-1.2.ebuild 952
-MD5 bb98f31399e4ffb68c78fc230e476bf6 ChangeLog 273
+MD5 c83c1fe9b243dd6b0658435dd6f70489 wmmenu-1.2-r1.ebuild 1050
+MD5 e7e0b7f39b50b5f7905a5968413e8c3c ChangeLog 1091
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 5477a4c7105bb065b867046de221b6f4 files/wmmenu-1.2-Makefile.patch 918
 MD5 75ce08b9efb5328f48a500ee9adc66e2 files/wmmenu-1.2-support-libdockapp-0.5.0.patch 506
-MD5 662859fc24714fd26e0abc75f154b3dc files/digest-wmmenu-1.2 61
+MD5 662859fc24714fd26e0abc75f154b3dc files/digest-wmmenu-1.2-r1 61
diff --git a/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
index 09f896d446c5..31c70739b6c5 100644
--- a/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild,v 1.1 2005/09/26 09:56:24 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit eutils
 
@@ -11,9 +11,9 @@ SRC_URI="http://www.fcoutant.freesurf.fr/download/${P}.tar.gz"
 HOMEPAGE="http://www.fcoutant.freesurf.fr/wmmenu.html"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 DEPEND="virtual/x11
-	=x11-libs/libdockapp-0.5.0-r1
+	>=x11-libs/libdockapp-0.5.0-r1
 	gnome? ( media-libs/gdk-pixbuf )"
 
 src_unpack()
@@ -38,5 +38,5 @@ src_install ()
 {
 	dobin wmmenu
 	doman wmmenu.1
-	dodoc COPYING README TODO example/apps example/defaults example/extract_icon_back
+	dodoc README TODO example/apps example/defaults example/extract_icon_back
 }
diff --git a/x11-plugins/wmmisc/ChangeLog b/x11-plugins/wmmisc/ChangeLog
index 4aa537c197db..6511edfb1b67 100644
--- a/x11-plugins/wmmisc/ChangeLog
+++ b/x11-plugins/wmmisc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmmisc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.1 2004/11/28 18:49:18 s4t4n Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
+
+  28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> wmmisc-0.9.ebuild:
+  mark ~ppc
+
+  26 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmmisc-0.9.ebuild:
+  Stable for x86. Fix copyright headers.
 
 *wmmisc-0.9 (28 Nov 2004)
 
diff --git a/x11-plugins/wmmisc/Manifest b/x11-plugins/wmmisc/Manifest
index 20a6e52dfa05..4c8f8e4cf5d4 100644
--- a/x11-plugins/wmmisc/Manifest
+++ b/x11-plugins/wmmisc/Manifest
@@ -1,2 +1,4 @@
-MD5 cd19e0fa0aa74fafe8624043cc1e76bf wmmisc-0.9.ebuild 649
+MD5 c0f65fd3d369d154746652bfcc115c1d ChangeLog 529
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 64d2e3e385a13571c427aaa1590d5e18 wmmisc-0.9.ebuild 750
 MD5 ad47537fa6f17cfab0bd45de09d30e4a files/digest-wmmisc-0.9 62
diff --git a/x11-plugins/wmmisc/wmmisc-0.9.ebuild b/x11-plugins/wmmisc/wmmisc-0.9.ebuild
index 0d0822117faf..4a58c8006309 100644
--- a/x11-plugins/wmmisc/wmmisc-0.9.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/wmmisc-0.9.ebuild,v 1.1 2004/11/28 18:49:18 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/wmmisc-0.9.ebuild,v 1.1.1.1 2005/11/30 10:10:56 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.dockapps.org/download.php/id/460/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/wmmixer/ChangeLog b/x11-plugins/wmmixer/ChangeLog
index 6f79582a65c2..bde8b47284f1 100644
--- a/x11-plugins/wmmixer/ChangeLog
+++ b/x11-plugins/wmmixer/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-plugins/wmmixer
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.1 2004/01/26 11:58:58 spock Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmixer-2.0_beta4.ebuild:
+  Removed COPYING from dodoc.
+
+  02 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmmixer-2.0_beta4.ebuild:
+  Add patch to honour Gentoo CXXFLAGS. Stable for x86.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmmixer-2.0_beta4.ebuild:
+  add sed-4 dep
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmmixer-2.0_beta4.ebuild:
+  QA - fix use invocation
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> wmmixer-2.0_beta4.ebuild:
+  Added ~mips keyword.
 
 *wmmixer-2.0_beta4 (26 Jan 2004)
 
diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
index 2adea3566709..31814cda1ab9 100644
--- a/x11-plugins/wmmixer/Manifest
+++ b/x11-plugins/wmmixer/Manifest
@@ -1,5 +1,5 @@
-MD5 e6cbfba352a3cd237e0be48a852f7236 ChangeLog 796
-MD5 d313f1862367f9f3a6b3bbf7e93338a6 metadata.xml 308
-MD5 527c443429b4a57fa7e00b0b4a2bccda wmmixer-2.0_beta4.ebuild 642
-MD5 0cfe90955e991fa1b15b01e24bd687ff files/digest-wmmixer-alsa-0.6 67
+MD5 d7efeba28b4a7278dc60e5e75354d868 wmmixer-2.0_beta4.ebuild 1285
+MD5 4df0623ccab11b136a210f606612bc39 ChangeLog 926
+MD5 e84eaa5e07fc9fe46f005861971b4b68 metadata.xml 310
 MD5 9b925052e5249f001a659e0c353ff29f files/digest-wmmixer-2.0_beta4 65
+MD5 1ebe55fdb272383c1cae1db36a7ae320 files/wmmixer-cflags.patch 189
diff --git a/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild b/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild
index 09f180f2cb5e..52d4fdcf6460 100644
--- a/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild,v 1.1 2004/01/26 11:58:58 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+inherit eutils
 
 IUSE="alsa oss"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="The next generation of WMMixer with native ALSA and OSS support."
 SRC_URI="http://freakzone.net/gordon/src/${PN}-2.0b4.tar.gz"
 HOMEPAGE="http://freakzone.net/gordon/#wmmixer"
 
 DEPEND="virtual/x11
-	alsa? ( media-libs/alsa-lib )"
+	alsa? ( media-libs/alsa-lib )
+	>=sys-apps/sed-4"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ~mips"
 
 S="${WORKDIR}/${PN}-2.0b4"
 
@@ -23,15 +25,18 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i 's#/usr/local/share#/usr/share#g' src/wmmixer.h example/*
+
+	# Allow use of Gentoo CXXFLAGS
+	epatch ${FILESDIR}/wmmixer-cflags.patch
 }
 
 src_compile() {
 
 	local myconf=""
 
-	if [ `use alsa` ] ; then
+	if use alsa ; then
 		myconf="${myconf} --enable-alsa"
-	elif [ `use oss` ] ; then
+	elif use oss ; then
 		myconf="${myconf} --disable-alsatest --enable-oss"
 	fi
 
@@ -42,7 +47,7 @@ src_compile() {
 src_install() {
 
 	einstall || die
-	dodoc README COPYING AUTHORS example/home.wmmixerrc example/home.wmmixer
+	dodoc README AUTHORS example/home.wmmixerrc example/home.wmmixer
 
 	einfo
 	einfo "Two sample configuration files have been installed in /usr/share/doc/${PF}/."
diff --git a/x11-plugins/wmmldonkey/ChangeLog b/x11-plugins/wmmldonkey/ChangeLog
index f7c109d8ee58..ae602dfc45c4 100644
--- a/x11-plugins/wmmldonkey/ChangeLog
+++ b/x11-plugins/wmmldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmldonkey
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmldonkey/ChangeLog,v 1.1 2003/12/25 23:55:49 pyrania Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmldonkey/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  02 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmmldonkey-0.003.ebuild:
+  Still a bit buggy, but I don't see it doing any harm...
+  Stable for x86.
 
 *wmmldonkey-0.003 (26 Dec 2003)
 
diff --git a/x11-plugins/wmmldonkey/Manifest b/x11-plugins/wmmldonkey/Manifest
index 9041eabf6038..99a11a86b0c1 100644
--- a/x11-plugins/wmmldonkey/Manifest
+++ b/x11-plugins/wmmldonkey/Manifest
@@ -1,4 +1,4 @@
-MD5 0234d91991d01e6c661fa0551f496e5b ChangeLog 310
-MD5 4719e916cabe20df559a3e88d5f4722a metadata.xml 250
-MD5 1cc72904e69709fa4e7553884418b641 wmmldonkey-0.003.ebuild 529
+MD5 1119de52a343c4c06c038a3c993153d9 ChangeLog 549
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 cc438700efcd2737af5ec787b8b1a749 wmmldonkey-0.003.ebuild 746
 MD5 a8951693f28ccf232685fbffcad37926 files/digest-wmmldonkey-0.003 62
diff --git a/x11-plugins/wmmldonkey/metadata.xml b/x11-plugins/wmmldonkey/metadata.xml
index f1e1deaf8395..b1a9efc4f2f0 100644
--- a/x11-plugins/wmmldonkey/metadata.xml
+++ b/x11-plugins/wmmldonkey/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-dock</herd>
-<longdescription>
-WMaker DockApp: ACPI status monitor for laptops
-</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild b/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild
index 68b8dfdf0d7a..3dc47fe9f5ac 100644
--- a/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild
+++ b/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild
@@ -1,20 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild,v 1.1 2003/12/25 23:55:49 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmldonkey/wmmldonkey-0.003.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 DESCRIPTION="wmmsg is a dockapp to show the up and downloadrate from your mldonkey"
 HOMEPAGE="http://dockapps.org/file.php/id/174"
 SRC_URI="http://dockapps.org/download.php/id/298/wmmldonkey3.tar.gz"
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/x11
 	net-p2p/mldonkey"
 S=${WORKDIR}/wmmldonkey3
 
-src_install() {
+src_install()
+{
 	dodoc CHANGELOG LICENSE README
 	exeinto /usr/bin
 	doexe wmmldonkey
 }
+
+pkg_postinst()
+{
+	einfo "Make sure the mldonkey daemon is running before you"
+	einfo "attempt to run emmldonkey..."
+}
diff --git a/x11-plugins/wmmon+smp/ChangeLog b/x11-plugins/wmmon+smp/ChangeLog
index 74db3951ab56..a73ef4d543f6 100644
--- a/x11-plugins/wmmon+smp/ChangeLog
+++ b/x11-plugins/wmmon+smp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-plugins/wmmon+smp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/ChangeLog,v 1.1 2002/09/16 16:02:05 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  07 Mar 2005; Markus Rothe <corsair@gentoo.org> wmmon+smp-1.0-r1.ebuild:
+  Stable on ppc64
+
+  25 Jan 2005; Markus Rothe <corsair@gentoo.org> wmmon+smp-1.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #79361
+
+  06 Dec 2003; Ian Leitch <port001@gentoo.org> wmmon+smp-1.0-r1.ebuild:
+  Reverted blocking of wmmon and made the binary installed 'wmmon+smp'. Please
+  see #33362. Thanks to Kris Kersey <augustus@linuxhardware.org> for reporting
+
+  16 Nov 2003; Markus Nigbur <pyrania@gentoo.org> wmmon+smp-1.0-r1.ebuild:
+  Blocking x11-plugins/wmmon.
 
 *wmmon+smp-1.0-r1 (1 Feb 2002)
 
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
index e69de29bb2d1..42ae447153f1 100644
--- a/x11-plugins/wmmon+smp/Manifest
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -0,0 +1,4 @@
+MD5 793eb6bc5d46eaa460b80ee185947859 ChangeLog 1314
+MD5 1653533716e7214c4098b8bd9b7f54d6 metadata.xml 444
+MD5 884e38619c60dcef42ec97059851aad7 wmmon+smp-1.0-r1.ebuild 714
+MD5 65ae74c588cc6bc40172f42b4b89e330 files/digest-wmmon+smp-1.0-r1 60
diff --git a/x11-plugins/wmmon+smp/metadata.xml b/x11-plugins/wmmon+smp/metadata.xml
index 7da61fb5ad3d..82cba0084a89 100644
--- a/x11-plugins/wmmon+smp/metadata.xml
+++ b/x11-plugins/wmmon+smp/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild
index a36bcdea05b1..d11978054924 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild
@@ -1,6 +1,8 @@
-# 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-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.1 2002/09/16 16:02:05 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+IUSE=""
 
 S=${WORKDIR}/wmmon.app
 S2=${S}/wmmon
@@ -10,7 +12,7 @@ HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ppc64"
 
 DEPEND="virtual/x11"
 
@@ -21,6 +23,7 @@ src_compile() {
 
 src_install () {
 	exeinto /usr/bin
-	doexe ${S2}/wmmon
+	cp ${S2}/wmmon ${S2}/wmmon+smp
+	doexe ${S2}/wmmon+smp
 	dodoc ${S}/README ${S}/COPYING ${S}/INSTALL
 }
diff --git a/x11-plugins/wmmon/ChangeLog b/x11-plugins/wmmon/ChangeLog
index 69b43fa2b417..a77bb112f77c 100644
--- a/x11-plugins/wmmon/ChangeLog
+++ b/x11-plugins/wmmon/ChangeLog
@@ -1,9 +1,72 @@
 # ChangeLog for x11-plugins/wmmon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmon-1.0_beta2-r3.ebuild,
+  wmmon-1.0_beta2-r2.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  wmmon-1.0_beta2-r3.ebuild:
+  Stable on sparc
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmmon-1.0_beta2-r3.ebuild:
+  Stable for x86.
+
+*wmmon-1.0_beta2-r3 (11 May 2005)
+
+  11 May 2005; Michele Noberasco <s4t4n@gentoo.org>
+  wmmon-1.0_beta2-r3.ebuild, files/wmmon-1.0_beta2-kernel26-v2.patch:
+  Replaced patch to make memory monitoring work with kernel 2.6 with
+  a new, improved, one, submitted by Ivan Heffner. Closes bug #89130.
+  wmmon-1.0_beta2-r1.ebuild:
+  Removed older ebuild.
+
+  28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  wmmon-1.0_beta2-r2.ebuild:
+  mark ~ppc
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  wmmon-1.0_beta2-r2.ebuild:
+  Stable on amd64.
+
+  20 Aug 2004; Jason Wever <weeve@gentoo.org> wmmon-1.0_beta2-r2.ebuild:
+  Stable on sparc.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> wmmon-1.0_beta2-r1.ebuild,
+  wmmon-1.0_beta2-r2.ebuild:
+  Typo in DESCRIPTION: applette -> applet. Bug 59717.
+
+  03 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmmon-1.0_beta2-r2.ebuild:
+  Stable on x86.
+  wmmon-1.0_beta2.ebuild:
+  Remove older ebuild.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmmon-1.0_beta2-r1.ebuild,
+  wmmon-1.0_beta2-r2.ebuild:
+  add sed-4 dep
+
+*wmmon-1.0_beta2-r2 (22 May 2004)
+
+  22 May 2004; Christian Birchinger <joker@gentoo.org>
+  wmmon-1.0_beta2-r2.ebuild, files/wmmon-1.0_beta2-kernel26.patch:
+  Added a patch to make memory monitoring work with kernel 2.6
+
+  06 Dec 2003; Ian Leitch <port001@gentoo.org> wmmon-1.0_beta2-r1.ebuild:
+  Reverting the block. See #33362
+
+  16 Nov 2003; Markus Nigbur <pyrania@gentoo.org> wmmon-1.0_beta2-r1.ebuild:
+  Blocking x11-plugins/wmmon+smp.
 
 *wmmon-1.0_beta2-r1 (9-Feb-2002)
 
+  18 Jan 2003; Seemant Kulleen <seemant@gentoo.org>
+  wmmon-1.0_beta2-r1.ebuild :
+
+  Removed spurious dependency on WindowMaker
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index e69de29bb2d1..b0449395f43f 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -0,0 +1,8 @@
+MD5 9464741d8bf20aa784e602944ac7b673 wmmon-1.0_beta2-r2.ebuild 834
+MD5 ff7695cb13755fd27cc2151f6ea61876 ChangeLog 2759
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 a6f933572e706e82b89219566fb94802 wmmon-1.0_beta2-r3.ebuild 838
+MD5 d434dabec24a1ef4e400c474adfb024c files/wmmon-1.0_beta2-kernel26-v2.patch 5675
+MD5 98b814408937f2d47b59cfedac2640e1 files/digest-wmmon-1.0_beta2-r2 62
+MD5 98b814408937f2d47b59cfedac2640e1 files/digest-wmmon-1.0_beta2-r3 62
+MD5 449f55da66d8174cae657ae52c58ebea files/wmmon-1.0_beta2-kernel26.patch 3333
diff --git a/x11-plugins/wmmon/metadata.xml b/x11-plugins/wmmon/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmmon/metadata.xml
+++ b/x11-plugins/wmmon/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild
index cc005e81fef6..765b155b839d 100644
--- a/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild,v 1.1 2004/05/22 03:04:35 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit eutils
 
 S="${WORKDIR}/${PN}.app"
 IUSE=""
-DESCRIPTION="Dockable system resources monitor applette for WindowMaker"
+DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
 WMMON_VERSION=1_0b2
 SRC_URI="http://rpig.dyndns.org/~anstinus/Linux/${PN}-${WMMON_VERSION}.tar.gz"
 HOMEPAGE="http://www.bensinclair.com/dockapp/"
 
-DEPEND="virtual/x11"
+DEPEND="virtual/x11
+	>=sys-apps/sed-4"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 sparc amd64 ~ppc"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}/${PN}
@@ -29,5 +30,5 @@ src_compile() {
 
 src_install () {
 	dobin wmmon/wmmon
-	dodoc BUGS CHANGES COPYING HINTS INSTALL README TODO
+	dodoc BUGS CHANGES HINTS README TODO
 }
diff --git a/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild
index d57ded844d7c..8c2a1bb9c5ea 100644
--- a/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild,v 1.1 2005/05/11 07:45:03 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild,v 1.1.1.1 2005/11/30 10:10:45 chriswhite Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc ~amd64 ~ppc"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}/${PN}
@@ -30,5 +30,5 @@ src_compile() {
 
 src_install () {
 	dobin wmmon/wmmon
-	dodoc BUGS CHANGES COPYING HINTS INSTALL README TODO
+	dodoc BUGS CHANGES HINTS README TODO
 }
diff --git a/x11-plugins/wmmp/ChangeLog b/x11-plugins/wmmp/ChangeLog
index 69ea443d8e14..4c505760a462 100644
--- a/x11-plugins/wmmp/ChangeLog
+++ b/x11-plugins/wmmp/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for x11-plugins/wmmp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/ChangeLog,v 1.1 2003/08/14 04:43:00 g2boojum Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+  07 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> wmmp-0.8.0.ebuild,
+  wmmp-0.9.1.ebuild, wmmp-0.9.2.ebuild, wmmp-0.10.0.ebuild:
+  Don't assume that ld is GNU ld. Removed src_compile as it falls back to
+  default. Don't install COPYING and INSTALL files.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> wmmp-0.10.0.ebuild:
+  Stable sparc.
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> wmmp-0.10.0.ebuild:
+  Stable on alpha.
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> wmmp-0.10.0.ebuild:
+  Stable x86.
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmmp-0.10.0.ebuild:
+  Marked stable on amd64.
+
+*wmmp-0.10.0 (14 Mar 2004)
+
+  14 Mar 2004; Martin Holzer <mholzer@gentoo.org> wmmp-0.10.0.ebuild:
+  Version bumped.
+
+  19 Nov 2003; Martin Holzer <mholzer@gentoo.org> wmmp-0.9.2.ebuild:
+  marked x86 stable. Closes #27002.
+
+*wmmp-0.9.2 (09 Oct 2003)
+
+  09 Oct 2003; Martin Holzer <mholzer@gentoo.org> wmmp-0.9.2.ebuild:
+  Version bumped.
+
+*wmmp-0.9.1 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> wmmp-0.9.1.ebuild:
+  Version bumped.
 
 *wmmp-0.8.0 (13 Aug 2003)
 
diff --git a/x11-plugins/wmmp/Manifest b/x11-plugins/wmmp/Manifest
index ee5417196d71..e955fc171699 100644
--- a/x11-plugins/wmmp/Manifest
+++ b/x11-plugins/wmmp/Manifest
@@ -1,2 +1,10 @@
-MD5 bdaf12209d2425f5799be45dba682da6 wmmp-0.8.0.ebuild 653
+MD5 39d2541088a699ee0e5d2ba28a43adf7 ChangeLog 1549
+MD5 d648674d5a073b865c66aceb371b4dc1 files/digest-wmmp-0.10.0 63
 MD5 beb727868a84018b72dd002d9f392004 files/digest-wmmp-0.8.0 62
+MD5 999b899312796e783824ace79291a08d files/digest-wmmp-0.9.1 62
+MD5 cdffa6ca398ffe7d0b9a1db438ecfe8b files/digest-wmmp-0.9.2 62
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 8e6837639c11448044271c7a3403b15e wmmp-0.10.0.ebuild 633
+MD5 690807ac188cd38760a4d8e7bba683c5 wmmp-0.8.0.ebuild 614
+MD5 8f1d2545ea33233322953e73c873634c wmmp-0.9.1.ebuild 622
+MD5 117a1c3996038e478c9c4213f43307b7 wmmp-0.9.2.ebuild 634
diff --git a/x11-plugins/wmmp/wmmp-0.10.0.ebuild b/x11-plugins/wmmp/wmmp-0.10.0.ebuild
index 773b26d04460..efbf4913ecd2 100644
--- a/x11-plugins/wmmp/wmmp-0.10.0.ebuild
+++ b/x11-plugins/wmmp/wmmp-0.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/wmmp-0.10.0.ebuild,v 1.1 2004/03/14 19:03:39 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/wmmp-0.10.0.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 IUSE=""
 
@@ -14,21 +14,12 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~amd64"
+KEYWORDS="x86 sparc alpha amd64"
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
 src_install () {
 	emake install DESTDIR=${D} || die
 
-	dodoc AUTHORS COPYING INSTALL README THANKS TODO
+	dodoc AUTHORS README THANKS TODO
 }
diff --git a/x11-plugins/wmmp/wmmp-0.8.0.ebuild b/x11-plugins/wmmp/wmmp-0.8.0.ebuild
index 644690521e71..96c702654b94 100644
--- a/x11-plugins/wmmp/wmmp-0.8.0.ebuild
+++ b/x11-plugins/wmmp/wmmp-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# 
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/wmmp-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 IUSE=""
 
@@ -12,25 +12,16 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="~x86 ~sparc ~alpha amd64"
 
 S=${WORKDIR}/${P/wm/WM}
 
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
 src_install () {
 	dobin src/WMmp
 
 	doman doc/WMmp.1
 
-	dodoc AUTHORS COPYING INSTALL README THANKS TODO
+	dodoc AUTHORS README THANKS TODO
 }
 
 
diff --git a/x11-plugins/wmmp/wmmp-0.9.1.ebuild b/x11-plugins/wmmp/wmmp-0.9.1.ebuild
index a943a3a8bc8b..61ac9959445c 100644
--- a/x11-plugins/wmmp/wmmp-0.9.1.ebuild
+++ b/x11-plugins/wmmp/wmmp-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# 
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/wmmp-0.9.1.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 IUSE=""
 
@@ -13,21 +13,12 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="~x86 ~sparc ~alpha amd64"
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
 src_install () {
 	emake install DESTDIR=${D} || die
 
-	dodoc AUTHORS COPYING INSTALL README THANKS TODO
+	dodoc AUTHORS README THANKS TODO
 }
diff --git a/x11-plugins/wmmp/wmmp-0.9.2.ebuild b/x11-plugins/wmmp/wmmp-0.9.2.ebuild
index a943a3a8bc8b..87f047007b5c 100644
--- a/x11-plugins/wmmp/wmmp-0.9.2.ebuild
+++ b/x11-plugins/wmmp/wmmp-0.9.2.ebuild
@@ -1,33 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# 
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/wmmp-0.9.2.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 IUSE=""
 
 MY_P=${P/wm/WM}
 DESCRIPTION="A Window Maker dock app client for Music Player Daemon(media-sound/mpd)"
-SRC_URI="http://mercury.chem.pitt.edu/~shank/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://www.musicpd.org"
 
 DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 ~sparc ~alpha amd64"
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
 src_install () {
 	emake install DESTDIR=${D} || die
 
-	dodoc AUTHORS COPYING INSTALL README THANKS TODO
+	dodoc AUTHORS README THANKS TODO
 }
diff --git a/x11-plugins/wmmp3/ChangeLog b/x11-plugins/wmmp3/ChangeLog
index 56dcbd8c65da..f4d009c92a59 100644
--- a/x11-plugins/wmmp3/ChangeLog
+++ b/x11-plugins/wmmp3/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for x11-plugins/wmmp3
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp3/ChangeLog,v 1.1 2004/07/17 14:51:16 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp3/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmp3-0.12.ebuild:
+  Remvoed COPYING from dodoc.
+
+  25 Sep 2005; Homer Parker <hparker@gentoo.org> wmmp3-0.12.ebuild:
+  Marked ~amd64.
+
+  24 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmmp3-0.12.ebuild:
+  Added patch to make safety checks on X includes and libraries, fixes
+  bug #103531.
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmmp3-0.12.ebuild:
+  Added ~sparc keyword.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmmp3-0.12.ebuild:
+  Stable for x86. Lower mpg123 dependency to version 0.59s-r2 as revision 3
+  is masked on ppc!
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmmp3-0.12.ebuild:
+  Masked wmmp3-0.12.ebuild stable for ppc
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmmp3-0.12.ebuild:
+  Added to ~ppc.
 
 *wmmp3-0.12 (17 Jul 2004)
 
diff --git a/x11-plugins/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
index e1c635ef7f09..dfacf4ceb575 100644
--- a/x11-plugins/wmmp3/Manifest
+++ b/x11-plugins/wmmp3/Manifest
@@ -1,2 +1,5 @@
-MD5 76123bf325c9233f9b0bf60117fd07dc wmmp3-0.12.ebuild 791
+MD5 b62e93f79329a203a79143b0b859e585 wmmp3-0.12.ebuild 1015
+MD5 5c875b90ecde424cad79d615e374ae72 ChangeLog 1171
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 632f433b2b4fca8b12da86ca825f44d6 files/digest-wmmp3-0.12 61
+MD5 15e66942968039ecdb324c4dee9f1e00 files/wmmp3-0.12-x_includes_n_libraries.patch 582
diff --git a/x11-plugins/wmmp3/wmmp3-0.12.ebuild b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
index 93b933582a10..dcb2ee53b004 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp3/wmmp3-0.12.ebuild,v 1.1 2004/07/17 14:51:16 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp3/wmmp3-0.12.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -10,10 +12,19 @@ SRC_URI="http://www.dotfiles.com/software/wmmp3/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 DEPEND="virtual/x11
-	>=media-sound/mpg123-0.59s-r3"
+	>=media-sound/mpg123-0.59s-r2"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# Fix #103531
+	epatch ${FILESDIR}/${P}-x_includes_n_libraries.patch
+}
 
 src_compile()
 {
@@ -25,7 +36,7 @@ src_compile()
 src_install()
 {
 	einstall || die "Installation failed"
-	dodoc AUTHORS COPYING ChangeLog sample.wmmp3 README TODO
+	dodoc AUTHORS ChangeLog sample.wmmp3 README TODO
 }
 
 pkg_postinst()
diff --git a/x11-plugins/wmmsens/ChangeLog b/x11-plugins/wmmsens/ChangeLog
index 6def22da5d8e..439979517483 100644
--- a/x11-plugins/wmmsens/ChangeLog
+++ b/x11-plugins/wmmsens/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmmsens
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.1 2004/03/01 18:27:08 rphillips Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmsens-0.29.6.ebuild:
+  removed Artistic and INSTALL from dodoc.
+
+  30 Jun 2005; Michele Noberasco <s4t4n@gentoo.org> wmmsens-0.29.6.ebuild:
+  Assigned to desktop-dock herd.
+
+  05 Aug 2004; Tom Martin <slarti@gentoo.org> wmmsens-0.29.6.ebuild:
+  Marked ~amd64.
 
 *wmmsens-0.29.6 (01 Mar 2004)
 
diff --git a/x11-plugins/wmmsens/Manifest b/x11-plugins/wmmsens/Manifest
index 994c557953c4..b0dd5cd0b98a 100644
--- a/x11-plugins/wmmsens/Manifest
+++ b/x11-plugins/wmmsens/Manifest
@@ -1,2 +1,4 @@
-MD5 4eed347a4538ba44db542cac8ca6f073 wmmsens-0.29.6.ebuild 813
+MD5 2e278e72f8b819e983bea9daa625d43c wmmsens-0.29.6.ebuild 870
+MD5 927cc4406b24764bf144d6317bcf26a1 ChangeLog 667
+MD5 5fb59ae4e503b4edd028ed8e0b09f2aa metadata.xml 230
 MD5 d72039dddf279a5580831188505cf88d files/digest-wmmsens-0.29.6 65
diff --git a/x11-plugins/wmmsens/metadata.xml b/x11-plugins/wmmsens/metadata.xml
index fc52d7ba53dd..7a8ba7719078 100644
--- a/x11-plugins/wmmsens/metadata.xml
+++ b/x11-plugins/wmmsens/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>desktop-dock</herd>
 <maintainer>
   <email>rphillips@gentoo.org</email>
 </maintainer>
diff --git a/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild b/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild
index 1af282e2b0cb..6cf598bcc730 100644
--- a/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild
+++ b/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild,v 1.1 2004/03/01 18:27:08 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="Window Maker dock app for monitoring your motherboard's hardware se
 SRC_URI="http://www.digressed.net/wmmsens/src//${P/_/-}.tar.gz"
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 DEPEND="virtual/x11"
 IUSE=""
 
@@ -25,7 +25,7 @@ src_compile() {
 
 src_install() {
 	cd ${S}
-	dodoc Artistic CREDITS ChangeLog INSTALL README TODO
+	dodoc CREDITS ChangeLog README TODO
 
 	cd src
 	mkdir -p ${D}/usr/bin
diff --git a/x11-plugins/wmmsg/ChangeLog b/x11-plugins/wmmsg/ChangeLog
index 5cfb7bab96f0..0031da85e84a 100644
--- a/x11-plugins/wmmsg/ChangeLog
+++ b/x11-plugins/wmmsg/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-plugins/wmmsg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/ChangeLog,v 1.1 2003/04/15 17:11:19 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmsg-1.0.ebuild:
+  removed INSTALL and COPYING from dodoc.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> wmmsg-1.0.ebuild:
+  Stable on ppc.
+
+  28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> wmmsg-1.0.ebuild:
+  mark ~ppc
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmmsg-1.0.ebuild:
+  Added ~sparc keyword.
+
+  23 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmmsg-1.0.ebuild:
+  Updated dodoc so that it does not try to install non-existent files.
+  Stable for x86.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> wmmsg-1.0.ebuild:
+  Add die following econf for bug 48950
 
 *wmmsg-1.0 (15 Apr 2003)
 
diff --git a/x11-plugins/wmmsg/Manifest b/x11-plugins/wmmsg/Manifest
index 4d8d5d370ba8..8d05cee50226 100644
--- a/x11-plugins/wmmsg/Manifest
+++ b/x11-plugins/wmmsg/Manifest
@@ -1,2 +1,4 @@
-MD5 e29cf2ef9bbcafeb57acac17f42da5b0 wmmsg-1.0.ebuild 695
+MD5 aaa55f1d0da989a2a2cf10ff87afb2fe wmmsg-1.0.ebuild 850
+MD5 f6e3e06e0d09423a480426dce7b5b974 ChangeLog 1034
+MD5 8e6a48972cb282dba7974e1aec516d3f metadata.xml 489
 MD5 8adc545af7c510d95d9464b601ecd2ad files/digest-wmmsg-1.0 61
diff --git a/x11-plugins/wmmsg/metadata.xml b/x11-plugins/wmmsg/metadata.xml
index 6779daedb11e..777b90c5ded1 100644
--- a/x11-plugins/wmmsg/metadata.xml
+++ b/x11-plugins/wmmsg/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.ebuild
index 30169690e333..6897da1fa706 100644
--- a/x11-plugins/wmmsg/wmmsg-1.0.ebuild
+++ b/x11-plugins/wmmsg/wmmsg-1.0.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/wmmsg-1.0.ebuild,v 1.1 2003/04/15 17:11:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/wmmsg-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 DESCRIPTION="wmmsg is a dockapp that informs you of new events, such as incoming chat messages, by displaying related icons and arrival times"
 HOMEPAGE="http://taxiway.swapspace.net/~matt/wmmsg/"
 SRC_URI="http://taxiway.swapspace.net/~matt/wmmsg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 DEPEND="virtual/x11
-    =x11-libs/gtk+-1.2*
-    media-libs/imlib2"
+	=x11-libs/gtk+-1.2*
+	media-libs/imlib2"
 S=${WORKDIR}/${PN}
 
 src_compile() {
-	econf
-	emake || die
+	econf || die "Configuration failed."
+	emake || die "Compilation failed."
 }
 
 src_install() {
-	einstall
-	dodoc AUTHORS COPYING INSTALL NEWS README TODO Changelog
+	einstall || die "Installation failed."
+	dodoc AUTHORS README Changelog
 	insinto /usr/share/doc/${PF}
 	doins wmmsgrc
 }
diff --git a/x11-plugins/wmnd/ChangeLog b/x11-plugins/wmnd/ChangeLog
index c6bc7dc05659..fc4facc4b4a2 100644
--- a/x11-plugins/wmnd/ChangeLog
+++ b/x11-plugins/wmnd/ChangeLog
@@ -1,9 +1,123 @@
 # ChangeLog for x11-plugins/wmnd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.1 2002/10/03 15:29:25 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
+  11 Nov 2005; Michele Noberaco <s4t4n@gentoo.org> wmnd-0.4.11-r1.ebuild,
+  wmnd-0.4.11.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> wmnd-0.4.11-r1.ebuild:
+  Stable on ppc.
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> wmnd-0.4.11-r1.ebuild:
+  Stable on sparc
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.11-r1.ebuild:
+  Stable for x86.
+
+*wmnd-0.4.11-r1 (16 May 2005)
+
+  16 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.11-r1.ebuild:
+  Revision bump, adding "snmp" USE flag. Closes #88067.
+
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.9.ebuild:
+  Wiped out older version.
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> wmnd-0.4.11.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.10.ebuild:
+  Removed older version.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> wmnd-0.4.11.ebuild:
+  stable on amd64
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> wmnd-0.4.11.ebuild:
+  Stable on sparc
+
+  29 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.11.ebuild:
+  Stable for x86. Fix copyright headers.
+  wmnd-0.4.10.ebuild, wmnd-0.4.9.ebuild:
+  Fix copyright headers.
+
+*wmnd-0.4.11 (28 Dec 2004)
+
+  28 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.11.ebuild:
+  Version bump.
+
+  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> wmnd-0.4.10.ebuild:
+  Stable on sparc
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmnd-0.4.10.ebuild:
+  Stable on amd64.
+
+  17 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.10.ebuild:
+  Stable for x86...
+
+*wmnd-0.4.10 (16 Oct 2004)
+
+  16 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.10.ebuild:
+  Version bump.
+  wmnd-0.4.9.ebuild:
+  Remove unnecessary eutils inheritance from ebuild...
+
+  13 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.7.ebuild:
+  Remove older ebuilds...
+
+  11 Sep 2004; Tom Martin <slarti@gentoo.org> wmnd-0.4.9.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmnd-0.4.9.ebuild:
+  Masked wmnd-0.4.9.ebuild stable for ppc
+
+  20 Aug 2004; Jason Wever <weeve@gentoo.org> wmnd-0.4.9.ebuild:
+  Stable on sparc.
+
+  16 Jul 2004; Michele Noberasco <s4t4n@gentoo.org>
+  wmnd-0.4.9.ebuild, wmnd-0.4.7.ebuild:
+  No longer depend on x11-wm/windowmaker. Closes #52529
+
+  30 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.9.ebuild:
+  Stable on x86.
+  wmnd-0.4.3.ebuild, wmnd-0.4.5.ebuild, wmnd-0.4.5-r1.ebuild:
+  Remove old ebuilds...
+
+*wmnd-0.4.9 (22 Jun 2004)
+
+  22 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmnd-0.4.9.ebuild:
+  Version bump, closes #54808
+  wmnd-0.4.3.ebuild, wmnd-0.4.5.ebuild,
+  wmnd-0.4.5-r1.ebuild, wmnd-0.4.7.ebuild:
+  updated headers to make repoman happier.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> wmnd-0.4.7.ebuild:
+  Stable on sparc.
+
+  15 Jul 2003; Nick Hadaway <raker@gentoo.org> wmnd-0.4.7.ebuild:
+  Added ppc keyword.
+
+*wmnd-0.4.7 (13 Jul 2003)
+
+  13 Jul 2003; Nick Hadaway <raker@gentoo.org> wmnd-0.4.7.ebuild:
+  Version bump.
+
+*wmnd-0.4.5-r1 (07 Jul 2003)
+
+  07 Jul 2003; Christian Birchinger <joker@gentoo.org> wmnd-0.4.5-r1.ebuild:
+  Install documentation and remove non-valid gpl.info file from the info dir
+
+*wmnd-0.4.5 (05 Jun 2003)
+
+  05 Jun 2003; robh <robh@gentoo.org> wmnd-0.4.5.ebuild:
+  version bump and new homepage. Thanks to Alex Fritze. Closes #19823.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmnd-0.4.3 (04 Oct 2002)
 
+  01 apr 2003; <spider@gentoo.org> wmnd-0.4.3.ebuild:
+  Removed xpm dep.  xpm lib is deprecated since a long time.  bug #1446
+
   04 Oct 2002; Nick Hadaway <raker@gentoo.org> wmnd-0.4.3.ebuild,
   files/digest-wmnd-0.4.3 :
   Initial adding of ebuild to portage.
diff --git a/x11-plugins/wmnd/Manifest b/x11-plugins/wmnd/Manifest
index e69de29bb2d1..eeea6d4a713c 100644
--- a/x11-plugins/wmnd/Manifest
+++ b/x11-plugins/wmnd/Manifest
@@ -0,0 +1,6 @@
+MD5 cded789991bb187d7f3177314ea6bba2 wmnd-0.4.11.ebuild 739
+MD5 534a13f66e3a00b2b8fffccb3974dec6 wmnd-0.4.11-r1.ebuild 863
+MD5 f7b40d13b64ae5f033678617e213b1ad ChangeLog 3994
+MD5 35b06c646b51979b2022449f31d7a7ee metadata.xml 448
+MD5 8a1fa932715cb4c1c287aabf20d0d276 files/digest-wmnd-0.4.11-r1 63
+MD5 8a1fa932715cb4c1c287aabf20d0d276 files/digest-wmnd-0.4.11 63
diff --git a/x11-plugins/wmnd/metadata.xml b/x11-plugins/wmnd/metadata.xml
index dfcaf66b6892..d9e273dc98c2 100644
--- a/x11-plugins/wmnd/metadata.xml
+++ b/x11-plugins/wmnd/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild b/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild
index 5022124a751c..6c207fda1990 100644
--- a/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild,v 1.1 2005/05/16 09:37:27 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 IUSE="snmp"
 DESCRIPTION="WindowMaker Network Devices (dockapp)"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.yuv.info/pub/wmnd/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 
 DEPEND="virtual/x11
 	snmp?   ( >=net-analyzer/net-snmp-5.2.1 )"
@@ -28,7 +28,7 @@ src_install()
 {
 	einstall || die "make install failed"
 
-	dodoc README AUTHORS COPYING ChangeLog INSTALL NEWS TODO
+	dodoc README AUTHORS ChangeLog NEWS TODO
 
 	# gpl.info is no valid .info file. Causes errors with install-info.
 	rm -r ${D}/usr/share/info
diff --git a/x11-plugins/wmnd/wmnd-0.4.11.ebuild b/x11-plugins/wmnd/wmnd-0.4.11.ebuild
index 1d90d4017ac1..6abeeca19929 100644
--- a/x11-plugins/wmnd/wmnd-0.4.11.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11.ebuild,v 1.1 2004/12/27 23:24:57 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="WindowMaker Network Devices (dockapp)"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.yuv.info/pub/wmnd/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 
 DEPEND="virtual/x11"
 
@@ -21,7 +21,7 @@ src_compile() {
 src_install() {
 	einstall || die "make install failed"
 
-	dodoc README AUTHORS COPYING ChangeLog INSTALL NEWS TODO
+	dodoc README AUTHORS ChangeLog NEWS TODO
 
 	# gpl.info is no valid .info file. Causes errors with install-info.
 	rm -r ${D}/usr/share/info
diff --git a/x11-plugins/wmnet/ChangeLog b/x11-plugins/wmnet/ChangeLog
index 3f5636c4acc5..63e0aa3490b2 100644
--- a/x11-plugins/wmnet/ChangeLog
+++ b/x11-plugins/wmnet/ChangeLog
@@ -1,13 +1,62 @@
 # 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 $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
-*wmnet-1.06.ebuild (8 Jun 2002)
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmnet-1.06.ebuild:
+  Removed older revision.
 
-  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> wmnet-1.06-r1.ebuild:
+  Stable on ppc.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> wmnet-1.06-r1.ebuild:
+  stable on amd64
+
+  08 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmnet-1.06-r1.ebuild:
+  Moved large patch to distfiles.
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> wmnet-1.06-r1.ebuild:
+  Stable on alpha.
+
+  28 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> wmnet-1.06-r1.ebuild:
+  Stable on sparc
+
+  26 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmnet-1.06-r1.ebuild:
+  Stable for x86. Update copyright headers.
+  wmnet-1.06.ebuild:
+  Update copyright headers.
+
+*wmnet-1.06-r1 (05 Dec 2004)
+
+  05 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> wmnet-1.06-r1.ebuild:
+  Revision bump, with new patchset. Closes #72818.
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmnet-1.06.ebuild:
+  Fix HOMEPAGE, closes #42381.
 
+  19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmnet-1.06.ebuild:
+  Inherit eutils.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> wmnet-1.06.ebuild:
+  Make stable on ppc 
+  Thanks to Florian Daniel for the testing
+
+  17 Jun 2003; Will Woods <wwoods@gentoo.org> wmnet-1.06.ebuild:
+  Marked stable for alpha
+
+  16 May 2003; Will Woods <wwoods@gentoo.org> wmnet-1.06.ebuild,
+  files/wmnet-1.06-nonx86.patch:
+  Added patch for non-x86 arches and ~alpha to KEYWORDS, small fix to use
+  CFLAGS when building.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*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. 
+
+  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-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index e69de29bb2d1..63eeb4b580d6 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -0,0 +1,4 @@
+MD5 bd1c094c5da322bfd22904c07f381177 wmnet-1.06-r1.ebuild 947
+MD5 b82a57e48b3f70a802785f238e2245b1 ChangeLog 2144
+MD5 9c871c5150118eedeea65810da151c07 metadata.xml 696
+MD5 e562d53e6d209a682db4b226c664a6f1 files/digest-wmnet-1.06-r1 130
diff --git a/x11-plugins/wmnet/files/digest-wmnet-1.06-r1 b/x11-plugins/wmnet/files/digest-wmnet-1.06-r1
index 5c529e7b47d4..e5595ffdc9af 100644
--- a/x11-plugins/wmnet/files/digest-wmnet-1.06-r1
+++ b/x11-plugins/wmnet/files/digest-wmnet-1.06-r1
@@ -1 +1,2 @@
 MD5 64e74c37c0cb5fd4fb81cfb0f5c4a264 wmnet-1.06.tar.gz 27506
+MD5 7233b39c9278d5832b2763e43745192b wmnet-1.06-misc.patch.bz2 11327
diff --git a/x11-plugins/wmnet/metadata.xml b/x11-plugins/wmnet/metadata.xml
index 3f516e34fc85..df079f4162b4 100644
--- a/x11-plugins/wmnet/metadata.xml
+++ b/x11-plugins/wmnet/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index 6eff1f4b7191..ca23fc4ed02a 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/wmnet-1.06-r1.ebuild,v 1.1 2004/12/05 11:47:59 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/wmnet-1.06-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 inherit eutils
 
 IUSE=""
 DESCRIPTION="WMnet is a dock.app network monitor"
-SRC_URI="http://www.digitalkaos.net/linux/wmnet/download/${P}.tar.gz"
+SRC_URI="http://www.digitalkaos.net/linux/wmnet/download/${P}.tar.gz
+	mirror://gentoo/${P}-misc.patch.bz2"
 HOMEPAGE="http://www.digitalkaos.net/linux/wmnet/"
 
 DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~ppc"
+KEYWORDS="x86 sparc alpha amd64 ppc"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	# Misc patchset, bug #72818
-	epatch ${FILESDIR}/${P}-misc.patch
+	epatch ${WORKDIR}/${P}-misc.patch
 
 	# Issue already taken care of in prev patchset
 	# epatch ${FILESDIR}/${P}-nonx86.patch
diff --git a/x11-plugins/wmnetload/ChangeLog b/x11-plugins/wmnetload/ChangeLog
index 7349bd9922b3..01094e743b76 100644
--- a/x11-plugins/wmnetload/ChangeLog
+++ b/x11-plugins/wmnetload/ChangeLog
@@ -1,9 +1,104 @@
 # ChangeLog for x11-plugins/wmnetload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.1 2002/10/07 17:58:21 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmnetload-1.3-r2.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+*wmnetload-1.3-r2 (26 Sep 2005)
+
+  26 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> wmnetload-1.3-r2.ebuild:
+  Revision bump, directly as stable, updating libdockapp dependancy. Closes bug #104903 and bug #105530.
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  wmnetload-1.3-r1.ebuild:
+  Stable on sparc
+
+  28 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> -wmnetload-1.3.ebuild:
+  clean old broken ebuild
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmnetload-1.3-r1.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmnetload-1.3-r1.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmnetload-1.3-r1.ebuild:
+  stable on ppc64, bug #62266
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmnetload-1.3-r1.ebuild, wmnetload-1.3.ebuild:
+  Masked wmnetload-1.3.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmnetload-1.3-r1.ebuild:
+  Masked wmnetload-1.3-r1.ebuild stable for ppc
+
+  31 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmnetload-1.3-r1.ebuild:
+  Stable for x86...
+
+*wmnetload-1.3-r1 (30 Jul 2004)
+
+  30 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmnetload-1.3-r1.ebuild:
+  Revision bump that adds patch to support libdockapp 0.5, closing #53605
+  wmnetload-1.3-r1.ebuild:
+  Change DEPEND to depend on version 0.4.0-r1 of libdockapp
+  Stable for x86...
+  wmnetload-1.0.ebuild, wmnetload-1.1.ebuild, wmnetload-1.2.ebuild:
+  Wipe out old ebuilds.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmnetload-1.0.ebuild:
+  glibc -> libc
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmnetload-1.3.ebuild:
+  Marked stable on amd64, removed S=.
+
+  16 Mar 2004; Markus Nigbur <pyrania@gentoo.org> wmnetload-1.3.ebuild:
+  There is no TODO.
+
+*wmnetload-1.3 (14 Mar 2004)
+
+  14 Mar 2004; Markus Nigbur <pyrania@gentoo.org> wmnetload-1.3.ebuild:
+  Version bump. Closing bug #44485.
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> wmnetload-1.2.ebuild:
+  Added to ~ppc.
+
+*wmnetload-1.2 (17 Dec 2002)
+
+  02 apr 2003; <spider@gentoo.org> wmnetload-1.0.ebuild, wmnetload-1.1.ebuild,
+  wmnetload-1.2.ebuild:
+  Fixing bug 1446  and removing xpm dep
+
+  19 Dec 2002; Martin Holzer <mholzer@gentoo.org> wmnetload-1.2.ebuild,
+  files/digest-wmnetload-1.2 Changelog :
+  Changed from tar.bz2 to tar.gz cause tar.bz2 seems to be broken :(
+  Fixing #12442.
+
+  17 Dec 2002; Brad Cowan <bcowan@gentoo.org> wmnetload-1.2.ebuild,
+  files/digest-wmnetload-1.2:
+  
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*wmnetload-1.1 (27 Oct 2002)
+
+  02 apr 2003; <spider@gentoo.org> wmnetload-1.0.ebuild, wmnetload-1.1.ebuild:
+  Fixing bug 1446  and removing xpm dep
+
+  27 Oct 2002; Brad Cowan <bcowan@gentoo.org> wmnetload-1.1.ebuild,
+  files/digest-wmnetload-1.1 :
+  
+  Version bump.
+
 
 *wmnetload-1.0 (07 Oct 2002)
 
+  02 apr 2003; <spider@gentoo.org> wmnetload-1.0.ebuild:
+  Fixing bug 1446  and removing xpm dep
+
   07 Oct 2002; Nick Hadaway <raker@gentoo.org> wmnetload-1.0.ebuild,
-  files/digest-wmnetload-1.0 :
+  ChangeLog, files/digest-wmnetload-1.0 :
+  
   New ebuild.  See bug #4892
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index e69de29bb2d1..34e5f6a7276a 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -0,0 +1,5 @@
+MD5 e8127a0192058be2c63de0b191b997d9 ChangeLog 3447
+MD5 a4e6b8fede98f4471909cda8b29bc02d metadata.xml 600
+MD5 ed9c497b6c27dcddfd86db5d6601f807 wmnetload-1.3-r2.ebuild 819
+MD5 8287f37c009e97ceef426da1acdc9965 files/digest-wmnetload-1.3-r2 65
+MD5 91c8ced226a5e46438cc17ca8e0eaa19 files/add_support_for_libdockapp_0.5.patch 2028
diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml
index c065a47a2403..75c0f2ec9c72 100644
--- a/x11-plugins/wmnetload/metadata.xml
+++ b/x11-plugins/wmnetload/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild
index a1fb335bae56..0454e2544b8a 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild,v 1.1 2005/09/26 10:57:00 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:44 chriswhite Exp $
 
 inherit eutils
 
@@ -35,5 +35,5 @@ src_compile()
 src_install()
 {
 	einstall || die "make install failed"
-	dodoc AUTHORS README NEWS INSTALL COPYING
+	dodoc AUTHORS README NEWS
 }
diff --git a/x11-plugins/wmnetmon/ChangeLog b/x11-plugins/wmnetmon/ChangeLog
index 55d6508a163f..d0f9dbed2e92 100644
--- a/x11-plugins/wmnetmon/ChangeLog
+++ b/x11-plugins/wmnetmon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-plugins/wmnetmon
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/ChangeLog,v 1.1 2003/11/02 02:39:04 pyrania Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmnetmon-0.2.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmnetmon-0.2.ebuild:
+  Masked wmnetmon-0.2.ebuild stable for ppc
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> wmnetmon-0.2.ebuild:
+  Added to ~ppc.
 
 *wmnetmon-0.2 (02 Nov 2003)
 
diff --git a/x11-plugins/wmnetmon/Manifest b/x11-plugins/wmnetmon/Manifest
index 72990577e4db..c14906e51d58 100644
--- a/x11-plugins/wmnetmon/Manifest
+++ b/x11-plugins/wmnetmon/Manifest
@@ -1,2 +1,4 @@
-MD5 a42dac33d41d9a1f907dee83a1ef9c7e wmnetmon-0.2.ebuild 1014
+MD5 354842860f38939b21927c4bc397a79e ChangeLog 634
+MD5 98d39d507ac46f99d9a982d40ba0e57b metadata.xml 413
+MD5 41683e20ca45c39ba232b8c0202701cb wmnetmon-0.2.ebuild 1007
 MD5 67391716cf398fd1aa6130abe6f096be files/digest-wmnetmon-0.2 65
diff --git a/x11-plugins/wmnetmon/metadata.xml b/x11-plugins/wmnetmon/metadata.xml
index 3231a5fe29ac..d6b0cdba77f4 100644
--- a/x11-plugins/wmnetmon/metadata.xml
+++ b/x11-plugins/wmnetmon/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild b/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild
index 26c4cb755f4c..9d0b0d6f3741 100644
--- a/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild
+++ b/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild,v 1.1 2003/11/02 02:39:04 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
+IUSE=""
 S=${WORKDIR}/${P}p5/
-DESCRIPTION="wmnetmon is a dockapp that monitors up to 40 hosts or services and can execute something there is a problem with any of them."
-SRC_URI="http://www.linuks.mine.nu/dockapps/${P}p5.tar.gz"
+DESCRIPTION="dockapp that monitors up to 40 hosts/services and can execute something if there is a problem with any of them"
 HOMEPAGE="http://freshmeat.net/projects/wmnetmon/?topic_id=876"
+SRC_URI="http://www.linuks.mine.nu/dockapps/${P}p5.tar.gz"
 
-DEPEND="virtual/x11"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc"
+
+DEPEND="virtual/x11"
 
 src_compile() {
 	econf --prefix=${D}/usr/bin || die "Configure failed."
 	emake || die "Make failed"
 }
 
-src_install ()
-{
+src_install() {
 	dobin wmnetmon
 	fowners root:root /usr/bin/wmnetmon
 	fperms 4755 /usr/bin/wmnetmon
 	dodoc README Changes wmnetmonrc
 }
 
-pkg_postinst ()
-{
+pkg_postinst() {
 	ewarn
 	ewarn "Before starting up wmnetmon, you must create a .wmnetmonrc in your home folder."
 	ewarn "Look at the sample wmnetmonrc.gz file in /usr/share/doc/${P}/."
diff --git a/x11-plugins/wmnetselect/ChangeLog b/x11-plugins/wmnetselect/ChangeLog
index b318ca04a989..5b0d0dabd0c6 100644
--- a/x11-plugins/wmnetselect/ChangeLog
+++ b/x11-plugins/wmnetselect/ChangeLog
@@ -1,7 +1,26 @@
 # ChangeLog for x11-plugins/wmnetselect
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmnetselect-0.8.ebuild:
+  Removed COPYING from dodoc.
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmnetselect-0.8.ebuild:
+  Remove older ebuild.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmnetselect-0.8-r1.ebuild:
+  Masked wmnetselect-0.8-r1.ebuild stable for ppc
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> wmnetselect-0.8-r1.ebuild,
+  wmnetselect-0.8.ebuild:
+  Typo in DESCRIPTION: doclette -> docklet. Bug 59717.
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> wmnetselect-0.8-r1.ebuild:
+  Added to ~ppc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmnetselect-0.8-r1 (9-Feb-2002)
 
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmnetselect/Manifest b/x11-plugins/wmnetselect/Manifest
index e69de29bb2d1..16cdda2ddc45 100644
--- a/x11-plugins/wmnetselect/Manifest
+++ b/x11-plugins/wmnetselect/Manifest
@@ -0,0 +1,4 @@
+MD5 77d7a276c25a3ef5605c97caee98fe34 wmnetselect-0.8-r1.ebuild 661
+MD5 352c27d0317bd9a5d24a73fcede512ae ChangeLog 1371
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 30e7a654e089241d24866526d45256f1 files/digest-wmnetselect-0.8-r1 66
diff --git a/x11-plugins/wmnetselect/metadata.xml b/x11-plugins/wmnetselect/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmnetselect/metadata.xml
+++ b/x11-plugins/wmnetselect/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild b/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
index 63ee17745f83..13bbf33cb90b 100644
--- a/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
+++ b/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
@@ -1,15 +1,15 @@
-# 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-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="WindowMaker browser launcher doclette"
+IUSE=""
+DESCRIPTION="WindowMaker browser launcher docklet"
 HOMEPAGE="http://freshmeat.net/projects/wmnetselect/"
 SRC_URI="ftp://ftp11.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc amd64 ppc"
 
 DEPEND="virtual/x11"
 
@@ -19,6 +19,6 @@ src_compile() {
 }
 
 src_install () {
-	dobin   wmnetselect
-	dodoc   COPYING README ChangeLog TODO README.html
+	dobin wmnetselect
+	dodoc README ChangeLog TODO README.html
 }
diff --git a/x11-plugins/wmpager/ChangeLog b/x11-plugins/wmpager/ChangeLog
index 52c0143dbc03..3b833b4bb35c 100644
--- a/x11-plugins/wmpager/ChangeLog
+++ b/x11-plugins/wmpager/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for x11-misc/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 $
+# ChangeLog for x11-plugins/wmpager
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  23 Sep 2005; Daniel Goller <morfic@gentoo.org> wmpager-1.2-r1.ebuild:
+  Adding ~amd64
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmpager-1.2-r1.ebuild:
+  glibc -> libc
 
 *wmpager-1.2-r1 (26 Dec 2003)
 
diff --git a/x11-plugins/wmpager/Manifest b/x11-plugins/wmpager/Manifest
index ccb8c7b10cae..025471e28396 100644
--- a/x11-plugins/wmpager/Manifest
+++ b/x11-plugins/wmpager/Manifest
@@ -1,4 +1,14 @@
-MD5 6c403516d2c7fba23093d15e5c4e1e90 wmpager-1.2-r1.ebuild 763
-MD5 9695f3db8d1cd2b15e776cc18a29742a ChangeLog 775
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bd241675c35a40b1fe1e5a6d4adebfa4 ChangeLog 1089
 MD5 042cee404485bb503546e27f5a3ca180 metadata.xml 161
+MD5 510e639b5cbfc9eb809794d591ebcd14 wmpager-1.2-r1.ebuild 751
 MD5 1dd5012756a79572f3f42486bc0500ba files/digest-wmpager-1.2-r1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDM0ej/aM9DdBw91cRAq+sAKCw3C9VDni3XrF+o1o69UtueFE+2QCguEbA
+e46BqDAN6wMTu+/mys94KCc=
+=mhg9
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmpager/wmpager-1.2-r1.ebuild b/x11-plugins/wmpager/wmpager-1.2-r1.ebuild
index d52ed5cb5f2a..be1644884d71 100644
--- a/x11-plugins/wmpager/wmpager-1.2-r1.ebuild
+++ b/x11-plugins/wmpager/wmpager-1.2-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/wmpager-1.2-r1.ebuild,v 1.1 2003/12/26 18:03:05 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpager/wmpager-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="A simple pager docklet for the WindowMaker window manager."
 HOMEPAGE="http://wmpager.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 DEPEND=">=sys-apps/sed-4"
 
 RDEPEND="virtual/x11
-	virtual/glibc"
+	virtual/libc"
 
 src_compile() {
 	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" \
diff --git a/x11-plugins/wmpasman/ChangeLog b/x11-plugins/wmpasman/ChangeLog
index 7b15c5fd6294..9fc2989e33cb 100644
--- a/x11-plugins/wmpasman/ChangeLog
+++ b/x11-plugins/wmpasman/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for x11-plugins/wmpasman
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpasman/ChangeLog,v 1.1 2003/08/16 03:50:28 g2boojum Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpasman/ChangeLog,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
+
+  13 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> wmpasman-0.8.3.ebuild:
+  Removed old ebuild.
+
+  12 Dec 2004; Jason Wever <weeve@gentoo.org> wmpasman-0.8.4.1.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmpasman-0.8.4.1.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmpasman-0.8.4.1.ebuild:
+  Masked wmpasman-0.8.4.1.ebuild stable for ppc
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> wmpasman-0.8.4.1.ebuild:
+  Added to ~ppc.
+
+  31 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpasman-0.8.4.1.ebuild:
+  Stable for x86.
+
+*wmpasman-0.8.4.1 (30 Jul 2004)
+
+  30 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpasman-0.8.4.1.ebuild:
+  Version bump. This version fixes a bug that prevented the app window
+  to show up...
+  wmpasman-0.8.3.ebuild:
+  Update DEPEND
 
 *wmpasman-0.8.3 (15 Aug 2003)
 
diff --git a/x11-plugins/wmpasman/Manifest b/x11-plugins/wmpasman/Manifest
index a194fe36e03b..0b3614d81d1a 100644
--- a/x11-plugins/wmpasman/Manifest
+++ b/x11-plugins/wmpasman/Manifest
@@ -1,2 +1,4 @@
-MD5 31148c9f49a1d07f12b06b83a9d018a1 wmpasman-0.8.3.ebuild 538
-MD5 feb60cb27910d9d56000bd78da854128 files/digest-wmpasman-0.8.3 66
+MD5 912520d30a8e9be5fc31f311022d8b30 wmpasman-0.8.4.1.ebuild 667
+MD5 d91de169de914d85fd25373e63d02d58 ChangeLog 1218
+MD5 188645bb6b73407ee997a8e6902b184b metadata.xml 437
+MD5 8be1a330c6fd84a9277df2360e6596d1 files/digest-wmpasman-0.8.4.1 68
diff --git a/x11-plugins/wmpasman/metadata.xml b/x11-plugins/wmpasman/metadata.xml
index 074a6a86ddc0..bb137643fab1 100644
--- a/x11-plugins/wmpasman/metadata.xml
+++ b/x11-plugins/wmpasman/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmpasman/wmpasman-0.8.4.1.ebuild b/x11-plugins/wmpasman/wmpasman-0.8.4.1.ebuild
index ec0359fb3fc5..eac19c572217 100644
--- a/x11-plugins/wmpasman/wmpasman-0.8.4.1.ebuild
+++ b/x11-plugins/wmpasman/wmpasman-0.8.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpasman/wmpasman-0.8.4.1.ebuild,v 1.1 2004/07/30 01:35:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpasman/wmpasman-0.8.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:35 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ppc ~sparc"
 
 DEPEND=">=x11-libs/gtk+-2.4.1
 	>=app-crypt/mhash-0.9.1
diff --git a/x11-plugins/wmpeople/ChangeLog b/x11-plugins/wmpeople/ChangeLog
index 2548c8485d9e..278666fd0f1e 100644
--- a/x11-plugins/wmpeople/ChangeLog
+++ b/x11-plugins/wmpeople/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for x11-plugins/wmpeople
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpeople/ChangeLog,v 1.1 2004/06/29 09:09:41 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpeople/ChangeLog,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmpeople-1.3.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmpeople-1.3.ebuild:
+  Masked wmpeople-1.3.ebuild stable for ppc
+
+  24 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpeople-1.3.ebuild:
+  Stable For x86.
+  wmpeople-1.2.ebuild:
+  Remove older versions.
+
+*wmpeople-1.3 (22 Jul 2004)
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpeople-1.3.ebuild:
+  Version bump. This one has support for transparent pixmaps.
+
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpeople-1.2.ebuild:
+  Stable on x86.
+
+  04 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> wmpeople-1.2.ebuild:
+  sync IUSE; don't install COPYING; don't sleep; tidy
+
+  30 Jun 2004; David Holm <dholm@gentoo.org> wmpeople-1.2.ebuild:
+  Added to ~ppc.
 
 *wmpeople-1.2 (29 Jun 2004)
 
diff --git a/x11-plugins/wmpeople/Manifest b/x11-plugins/wmpeople/Manifest
index 300f1feb6fcb..a08eca4ad067 100644
--- a/x11-plugins/wmpeople/Manifest
+++ b/x11-plugins/wmpeople/Manifest
@@ -1,4 +1,4 @@
-MD5 854bb0f46f37e16adc1615c037518fef wmpeople-1.2.ebuild 882
-MD5 9911bf59033ae85abc6484ef4f5ce224 ChangeLog 241
+MD5 9168772ced545c33fda1cadd88faa108 ChangeLog 1162
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 83b57b77cf974f19f425edef563078fe files/digest-wmpeople-1.2 64
+MD5 b4ea8a5e566580068e688c3174d0fdd8 wmpeople-1.3.ebuild 882
+MD5 a190de143c4292e075db51b36d7f0514 files/digest-wmpeople-1.3 64
diff --git a/x11-plugins/wmpeople/wmpeople-1.3.ebuild b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
index bd9962cc55aa..af011045d734 100644
--- a/x11-plugins/wmpeople/wmpeople-1.3.ebuild
+++ b/x11-plugins/wmpeople/wmpeople-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpeople/wmpeople-1.3.ebuild,v 1.1 2004/07/22 00:57:38 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpeople/wmpeople-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:39 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/peephole/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE=""
 
 DEPEND="
diff --git a/x11-plugins/wmpiki/ChangeLog b/x11-plugins/wmpiki/ChangeLog
index e198bcff4247..f2ebdab4a2e8 100644
--- a/x11-plugins/wmpiki/ChangeLog
+++ b/x11-plugins/wmpiki/ChangeLog
@@ -1,8 +1,21 @@
 # ChangeLog for x11-plugins/wmpiki
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/ChangeLog,v 1.1 2004/07/08 13:02:17 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmpiki-0.2.1.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmpiki-0.2.1.ebuild:
+  Masked wmpiki-0.2.1.ebuild stable for ppc
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> wmpiki-0.2.1.ebuild:
+  Added to ~ppc.
 
 *wmpiki-0.2.1 (08 Jul 2004)
 
+  13 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpiki-0.2.1.ebuild:
+  Stable on x86.
+
   08 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpiki-0.2.1.ebuild:
   Initial import.
diff --git a/x11-plugins/wmpiki/Manifest b/x11-plugins/wmpiki/Manifest
index 916537492d1b..0133cf8b18b6 100644
--- a/x11-plugins/wmpiki/Manifest
+++ b/x11-plugins/wmpiki/Manifest
@@ -1,4 +1,4 @@
-MD5 1c103e9dff3580d2f97b1761a84595b2 wmpiki-0.2.1.ebuild 768
-MD5 b021269637192e8801b4d917a9a0e591 ChangeLog 239
+MD5 30766ecf999ab34119939691f064bf58 ChangeLog 722
 MD5 a6bb65fb883aa8323b6bfd6287e3f062 metadata.xml 528
+MD5 aa142d22a74c233a808253b4e341b490 wmpiki-0.2.1.ebuild 772
 MD5 79b24bd4ef507d39a20ccab25256ce72 files/digest-wmpiki-0.2.1 63
diff --git a/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild b/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild
index 4e55b3602373..b00fecd31e6c 100644
--- a/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild
+++ b/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild,v 1.1 2004/07/08 13:02:17 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://clay.ll.pl/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~sparc"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/wmpinboard/ChangeLog b/x11-plugins/wmpinboard/ChangeLog
index 8f105012bed9..def2b7b590ac 100644
--- a/x11-plugins/wmpinboard/ChangeLog
+++ b/x11-plugins/wmpinboard/ChangeLog
@@ -1,9 +1,30 @@
 # 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 $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmpinboard-1.0.ebuild:
+  Masked wmpinboard-1.0.ebuild stable for ppc
+
+  20 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpinboard-1.0.ebuild:
+  Added patch to fix segfault when adding a new note. Closes #43369.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> wmpinboard-1.0.ebuild:
+  Add die following econf for bug 48950
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> wmpinboard-1.0.ebuild:
+  Added to ~ppc.
+
+  17 Jun 2003; Will Woods <wwoods@gentoo.org> wmpinboard-1.0.ebuild:
+  Added alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmpinboard-1.0 (26 May 2002)
 
+  01 apr 2003; <spider@gentoo.org> wmpinboard-1.0.ebuild:
+  fixing bug 1446, removed xpm dependency
+
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
   Relocated to x11-plugins
diff --git a/x11-plugins/wmpinboard/Manifest b/x11-plugins/wmpinboard/Manifest
index e69de29bb2d1..58d2246450d3 100644
--- a/x11-plugins/wmpinboard/Manifest
+++ b/x11-plugins/wmpinboard/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b7154ac28fd39be2b6594aa27b3aed0b ChangeLog 1176
+MD5 45429fba57096382c86e58733f1f0385 files/digest-wmpinboard-1.0 67
+MD5 b7532acbb5f32e091d85cf67e343fd30 files/wmpinboard-1.0-segfault.patch 320
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 1286449f1cd4f17b8a52f543803f1f4f wmpinboard-1.0.ebuild 708
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0wIaI1lqEGTUzyQRAjZ/AKCAfrah7Y8WwJDvypB04KWPS3JMTwCgmY1z
+UkE/X1kyy2go0p1yEDqgsE8=
+=sLKt
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmpinboard/metadata.xml b/x11-plugins/wmpinboard/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmpinboard/metadata.xml
+++ b/x11-plugins/wmpinboard/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index 6ed2874d0689..ef596b381d00 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
+
+IUSE=""
 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"
 
-DEPEND="virtual/x11
-	media-libs/xpm"
+DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc alpha amd64 ppc"
 
-src_compile() {
-	econf
-	emake || die "emake failed"
+src_unpack()
+{
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/wmpinboard-1.0-segfault.patch
 }
 
-src_install () {
-	make DESTDIR=${D} install-strip || die "install failed"
+src_install ()
+{
+	make DESTDIR="${D}" install || die "install failed"
 }
-	
diff --git a/x11-plugins/wmpop/ChangeLog b/x11-plugins/wmpop/ChangeLog
index b9711247caf4..ca7a28724d25 100644
--- a/x11-plugins/wmpop/ChangeLog
+++ b/x11-plugins/wmpop/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmpop
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop/ChangeLog,v 1.1 2003/12/16 22:00:35 port001 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> wmpop-0.53.ebuild:
+  Fixed dodoc not to install COPYING and/or INSTALL.
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmpop-0.53.ebuild:
+  Added ~sparc keyword.
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> wmpop-0.53.ebuild:
+  Marked stable.
 
 *wmpop-0.53 (16 Dec 2003)
 
diff --git a/x11-plugins/wmpop/Manifest b/x11-plugins/wmpop/Manifest
index cfb32cd80c15..714bebb57fb7 100644
--- a/x11-plugins/wmpop/Manifest
+++ b/x11-plugins/wmpop/Manifest
@@ -1,2 +1,4 @@
-MD5 665f9fa3a108ef94ebf6d7ede3592130 wmpop-0.53.ebuild 695
+MD5 dbd250b88e81c67af6975083ab5c1729 ChangeLog 699
 MD5 454e68f33f76b732c1f538b2c359f733 files/digest-wmpop-0.53 62
+MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
+MD5 99f860081561a4fa2017fb11ad3febc5 wmpop-0.53.ebuild 768
diff --git a/x11-plugins/wmpop/wmpop-0.53.ebuild b/x11-plugins/wmpop/wmpop-0.53.ebuild
index 7f8878151b07..1aeed90b5a4d 100644
--- a/x11-plugins/wmpop/wmpop-0.53.ebuild
+++ b/x11-plugins/wmpop/wmpop-0.53.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop/wmpop-0.53.ebuild,v 1.1 2003/12/16 22:00:35 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop/wmpop-0.53.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://wmpop.sautret.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc"
 
 DEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*
@@ -25,5 +25,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "Install failed"
-	dodoc AUTHORS COPYING README ChangeLog NEWS INSTALL TODO THANKS ABOUT-NLS
+	dodoc AUTHORS README ChangeLog NEWS TODO THANKS ABOUT-NLS
 }
diff --git a/x11-plugins/wmpop3/ChangeLog b/x11-plugins/wmpop3/ChangeLog
index e6a6cfd0817f..b67ad39d121b 100644
--- a/x11-plugins/wmpop3/ChangeLog
+++ b/x11-plugins/wmpop3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmpop3
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3/ChangeLog,v 1.1 2003/01/14 07:02:24 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmpop3-0.5.6a.ebuild:
+  Stable for x86.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmpop3-0.5.6a.ebuild:
+  glibc -> libc, add sed-4 dep
 
 *wmpop3-0.5.6a (14 Jan 2003)
 
diff --git a/x11-plugins/wmpop3/Manifest b/x11-plugins/wmpop3/Manifest
index e69de29bb2d1..b4d9b89605b0 100644
--- a/x11-plugins/wmpop3/Manifest
+++ b/x11-plugins/wmpop3/Manifest
@@ -0,0 +1,4 @@
+MD5 f7ef02dd698aa6aebce7e4434898bd50 wmpop3-0.5.6a.ebuild 730
+MD5 3cd25e1c6b5548298bf8602dbe6419b5 ChangeLog 586
+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 b65554ab9976..6101606ee812 100644
--- a/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild
+++ b/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2003/01/14 07:02:24 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3/wmpop3-0.5.6a.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
 DESCRIPTION="dockapp for checking pop3 accounts"
 HOMEPAGE="http://www.cs.mun.ca/~scotth/"
 SRC_URI="http://www.cs.mun.ca/~scotth/download/${P/wmpop3/WMPop3}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
-	x11-wm/WindowMaker"
-S=${WORKDIR}/${P}
+	x11-wm/windowmaker
+	>=sys-apps/sed-4"
 
 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/ChangeLog b/x11-plugins/wmpop3lb/ChangeLog
index 0f23c0d0931a..77ba92973db6 100644
--- a/x11-plugins/wmpop3lb/ChangeLog
+++ b/x11-plugins/wmpop3lb/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for x11-plugins/wmpop3lb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.1 2002/10/08 14:43:18 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
-wmpop3lb-2.4.2 (08 Oct 2002)
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmpop3lb-2.4.2.ebuild:
+  add sed-4 dep
+
+*wmpop3lb-2.4.2 (08 Oct 2002)
+
+  18 Jan 2003; Seeemant Kulleen <seemant@gentoo.org> wmpop3lb-2.4.2.ebuild :
+
+  Removed spurious dependency on WindowMaker.
 
   08 Oct 2002; Nick Hadaway <raker@gentoo.org> wmpop3lb-2.4.2.ebuild,
   files/digest-wmpop3lbp-2.4.2 :
diff --git a/x11-plugins/wmpop3lb/Manifest b/x11-plugins/wmpop3lb/Manifest
index e69de29bb2d1..c64567ab748d 100644
--- a/x11-plugins/wmpop3lb/Manifest
+++ b/x11-plugins/wmpop3lb/Manifest
@@ -0,0 +1,4 @@
+MD5 14866105c8a56b7ec5dbe3463b64b8c4 ChangeLog 593
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 96aedd214395024e47b53cf23238f643 wmpop3lb-2.4.2.ebuild 738
+MD5 404dcd51efee01978f6bbb6c0c9b551a files/digest-wmpop3lb-2.4.2 64
diff --git a/x11-plugins/wmpop3lb/metadata.xml b/x11-plugins/wmpop3lb/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmpop3lb/metadata.xml
+++ b/x11-plugins/wmpop3lb/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
index 12ee002af1cf..12d0adb29f41 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
@@ -1,45 +1,33 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2002/10/08 14:43:18 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:42 chriswhite Exp $
 
 IUSE=""
 
-VERSION=2.4.2
-S=${WORKDIR}/wmpop3lb${VERSION}
-
+MY_P=${PN}${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="dockapp for checking up to 7 pop3 accounts"
 HOMEPAGE="http://wmpop3lb.jourdain.org"
-SRC_URI="http://lbj.free.fr/wmpop3/wmpop3lb${VERSION}.tar.gz"
+SRC_URI="http://lbj.free.fr/wmpop3/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64"
 
-DEPEND="virtual/glibc
-	virtual/x11
-	x11-wm/WindowMaker"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/x11
+	>=sys-apps/sed-4"
 
 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() {
-
 	emake -C wmpop3 || die "parallel make failed"
-
 }
 
 src_install() {
-
 	dobin wmpop3/wmpop3lb
-
 	dodoc CHANGE_LOG README
-
 }
diff --git a/x11-plugins/wmpower/ChangeLog b/x11-plugins/wmpower/ChangeLog
index 9ee7dc92614f..fdc1ba6f67d0 100644
--- a/x11-plugins/wmpower/ChangeLog
+++ b/x11-plugins/wmpower/ChangeLog
@@ -1,6 +1,84 @@
 # ChangeLog for x11-plugins/wmpower
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/ChangeLog,v 1.1 2003/06/03 06:26:06 bcowan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.4.2.ebuild,
+  wmpower-0.4.1.ebuild:
+  Removed COPYING from dodoc.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> wmpower-0.4.2.ebuild:
+  Stable on ppc.
+
+  19 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.4.2.ebuild:
+  Stable for x86.
+
+*wmpower-0.4.2 (22 Jul 2005)
+
+  22 Jul 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.4.2.ebuild:
+  Version bump.
+
+  23 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.3.1.ebuild:
+  Wiped out older version.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> wmpower-0.4.1.ebuild:
+  Stable on ppc.
+
+  20 Apr 2005; Simon Stelling <blubb@gentoo.org> wmpower-0.4.1.ebuild:
+  stable on amd64
+
+  07 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.4.1.ebuild:
+  Stable for x86.
+  wmpower-0.4.0.ebuild:
+  Removed older version.
+
+*wmpower-0.4.1 (25 Feb 2005)
+
+  25 Feb 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.4.1.ebuild:
+  Version bump.
+
+*wmpower-0.4.0 (23 Feb 2005)
+
+  23 Feb 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.4.0.ebuild:
+  Version bump. Added ~ppc keyword as I got positive feedback on CVS version.
+
+  25 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.3.1.ebuild:
+  Update Copyright headers
+
+  13 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.3.1.ebuild:
+  Remove no longer needed eutils inheritance...
+
+  12 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.3.0.ebuild:
+  Remove older ebuild...
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmpower-0.3.1.ebuild:
+  Stable on amd64.
+
+  30 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.3.1.ebuild:
+  Stable on x86.
+  wmpower-0.1.2.ebuild, wmpower-0.1.3.ebuild:
+  Wipe out old versions.
+
+*wmpower-0.3.1 (22 Jun 2004)
+
+  22 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmpower-0.3.1.ebuild:
+  Version Bump. Closes #45076.
+  The cflags.patch is no longer needed as the problem was fixed upstream.
+  wmpower-0.1.3.ebuild, wmpower-0.1.2.ebuild:
+  Fix the Copyright headers to make repoman happy
+
+*wmpower-0.3.0 (22 Oct 2003)
+
+  22 Oct 2003; Markus Nigbur <pyrania@gentoo.org> wmpower-0.3.0.ebuild:
+  Version Bump. Thanks to Michele Noberasco (#31738).
+
+  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org> wmpower-0.1.2.ebuild,
+  wmpower-0.1.3.ebuild:
+  xpm is provided by xfree
+
+*wmpower-0.1.3 (06 Jun 2003)
+
+  06 Jun 2003; robh <robh@gentoo.org> wmpower-0.1.3.ebuild:
+  version bump, noted by Noberasco Michele, closes #22250
 
 *wmpower-0.1.2 (03 Jun 2003)
 
diff --git a/x11-plugins/wmpower/Manifest b/x11-plugins/wmpower/Manifest
index 893ea0193108..80cfb7dadee9 100644
--- a/x11-plugins/wmpower/Manifest
+++ b/x11-plugins/wmpower/Manifest
@@ -1,2 +1,6 @@
-MD5 4b8987cf845eaae2e909f0d2916bf373 wmpower-0.1.2.ebuild 576
-MD5 a84385e6c8136225526082cd79afa966 files/digest-wmpower-0.1.2 65
+MD5 1d7737e2217690e8da142745a575c296 wmpower-0.4.2.ebuild 901
+MD5 973611d5cb0578f4921de4b9c59b25ea wmpower-0.4.1.ebuild 900
+MD5 39910df7773b29ea0f9c133282801fcb ChangeLog 2856
+MD5 e4a837b9af84bef3c70c3974bc982d71 metadata.xml 519
+MD5 e6933ed68fd606be080603e0f3e1de48 files/digest-wmpower-0.4.1 65
+MD5 0525731ff965b91047c3fd899aedd798 files/digest-wmpower-0.4.2 65
diff --git a/x11-plugins/wmpower/metadata.xml b/x11-plugins/wmpower/metadata.xml
index 1b426962823e..5f9bac0c26dc 100644
--- a/x11-plugins/wmpower/metadata.xml
+++ b/x11-plugins/wmpower/metadata.xml
@@ -1,13 +1,11 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-dock</herd>
 <longdescription>
 wmpower is a Window Maker dock application
-allowing the user to graphically see (and set) the
-power management status of his laptop. It works
-with both APM and ACPI enabled kernels.
+allowing the user to graphically see (and set) the power management status of his laptop.
+It works with both APM and ACPI enabled kernels, has special support for Toshiba, Compal
+and Dell hardware, and allows you to dinamically set the frequency of your CPU(s) via CPUfreq.
 </longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmpower/wmpower-0.4.1.ebuild b/x11-plugins/wmpower/wmpower-0.4.1.ebuild
index 1ea28fca49aa..84914b097d59 100644
--- a/x11-plugins/wmpower/wmpower-0.4.1.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.4.1.ebuild,v 1.1 2005/02/25 07:57:16 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc"
 
 DEPEND="virtual/x11"
 
@@ -24,5 +24,5 @@ src_compile()
 src_install()
 {
 	einstall || die "Installation failed"
-	dodoc AUTHORS BUGS COPYING ChangeLog LEGGIMI NEWS README README.compal THANKS TODO
+	dodoc AUTHORS BUGS ChangeLog LEGGIMI NEWS README README.compal THANKS TODO
 }
diff --git a/x11-plugins/wmpower/wmpower-0.4.2.ebuild b/x11-plugins/wmpower/wmpower-0.4.2.ebuild
index 3b3e118dbb12..e0aa8d09e825 100644
--- a/x11-plugins/wmpower/wmpower-0.4.2.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.4.2.ebuild,v 1.1 2005/07/22 08:30:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpower/wmpower-0.4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ppc x86"
 
 DEPEND="virtual/x11"
 
@@ -24,5 +24,5 @@ src_compile()
 src_install()
 {
 	einstall || die "Installation failed"
-	dodoc AUTHORS BUGS COPYING ChangeLog LEGGIMI NEWS README README.compal THANKS TODO
+	dodoc AUTHORS BUGS ChangeLog LEGGIMI NEWS README README.compal THANKS TODO
 }
diff --git a/x11-plugins/wmppp/ChangeLog b/x11-plugins/wmppp/ChangeLog
index 592f1438b44c..55b2a81d4b67 100644
--- a/x11-plugins/wmppp/ChangeLog
+++ b/x11-plugins/wmppp/ChangeLog
@@ -1,7 +1,18 @@
 # 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 $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
+  11 Nov 2005; Michele Noebrasco <s4t4n@gentoo.org> wmppp-1.3.0.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmppp-1.3.0.ebuild:
+  Masked wmppp-1.3.0.ebuild stable for ppc
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> wmppp-1.3.0.ebuild:
+  Added to ~ppc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmppp-1.3.0 (7-Feb-2002)
 
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmppp/Manifest b/x11-plugins/wmppp/Manifest
index e69de29bb2d1..2db8c1b0c4be 100644
--- a/x11-plugins/wmppp/Manifest
+++ b/x11-plugins/wmppp/Manifest
@@ -0,0 +1,4 @@
+MD5 7468b739ee6eca89f2183e3aa9e6738a wmppp-1.3.0.ebuild 713
+MD5 d04c04185414f6c508763a9cc2e0408b ChangeLog 821
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 4400a05794189fba85296c0ad90190f0 files/digest-wmppp-1.3.0 62
diff --git a/x11-plugins/wmppp/metadata.xml b/x11-plugins/wmppp/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmppp/metadata.xml
+++ b/x11-plugins/wmppp/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmppp/wmppp-1.3.0.ebuild b/x11-plugins/wmppp/wmppp-1.3.0.ebuild
index ee1433afb3ca..e801e863880a 100644
--- a/x11-plugins/wmppp/wmppp-1.3.0.ebuild
+++ b/x11-plugins/wmppp/wmppp-1.3.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright (c) Vitaly Kushneriuk
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/wmppp-1.3.0.ebuild,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmppp/wmppp-1.3.0.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
+IUSE=""
 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"
+HOMEPAGE="http://windowmaker.mezaway.org/" #but this site has been dead for a while ;(
 
 DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc amd64 ppc"
 
 src_compile() {
 	emake all || die
@@ -23,5 +24,5 @@ src_install () {
 	doexe getmodemspeed
 	dodoc user.wmppprc
 	cd ..
-	dodoc BUGS  CHANGES  COPYING  HINTS  INSTALL  README  TODO
+	dodoc BUGS CHANGES HINTS README TODO
 }
diff --git a/x11-plugins/wmrack/ChangeLog b/x11-plugins/wmrack/ChangeLog
index 310e07e19bf5..9b6a799c2cee 100644
--- a/x11-plugins/wmrack/ChangeLog
+++ b/x11-plugins/wmrack/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmrack
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrack/ChangeLog,v 1.1 2004/07/17 23:05:10 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrack/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  18 Jul 2005; Michele Noberasco <s4t4n@gentoo.org> wmrack-1.2.0.ebuild:
+  Set x-includes and x-libraries in econf. Hopefully fixes #98537.
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmrack-1.2.0.ebuild:
+  Stable on x86.
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmrack-1.2.0.ebuild:
+  Added to ~ppc.
 
 *wmrack-1.2.0 (18 Jul 2004)
 
diff --git a/x11-plugins/wmrack/Manifest b/x11-plugins/wmrack/Manifest
index 2084986dcac4..cbf22e467e1d 100644
--- a/x11-plugins/wmrack/Manifest
+++ b/x11-plugins/wmrack/Manifest
@@ -1,5 +1,5 @@
-MD5 16bdd3143bbb4d702e1706cfa8ea3662 wmrack-1.2.0.ebuild 755
-MD5 57350cb4fe66632d3fd97d826aa53572 ChangeLog 283
+MD5 ab48900e4d8333ef56ac3830d5050655 wmrack-1.2.0.ebuild 929
+MD5 10b64c1a2fdb5eb545ad1855e19d8289 ChangeLog 688
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 7c03b5a3514ffb309dddc36de519a58a files/digest-wmrack-1.2.0 61
 MD5 783018d433bab388483e7452786794e1 files/wmrack.desktop 208
diff --git a/x11-plugins/wmrack/wmrack-1.2.0.ebuild b/x11-plugins/wmrack/wmrack-1.2.0.ebuild
index cc12a928640d..f9bf84d51a70 100644
--- a/x11-plugins/wmrack/wmrack-1.2.0.ebuild
+++ b/x11-plugins/wmrack/wmrack-1.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrack/wmrack-1.2.0.ebuild,v 1.1 2004/07/17 23:05:10 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrack/wmrack-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
 MY_P=${P/2.0/2}
@@ -14,14 +16,14 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 S=${WORKDIR}/${MY_P}
 
 src_compile()
 {
 	cd ${S}
-	econf --with-x --prefix=/usr --sysconfdir=/etc || die "Configuration failed"
+	econf --with-x --prefix=/usr --sysconfdir=/etc --x-includes=/usr/include/ --x-libraries=$(get_libdir) || die "Configuration failed"
 	emake || die "Compilation failed"
 }
 
diff --git a/x11-plugins/wmrecord/ChangeLog b/x11-plugins/wmrecord/ChangeLog
index b2f698f06b61..772b7b1fd8df 100644
--- a/x11-plugins/wmrecord/ChangeLog
+++ b/x11-plugins/wmrecord/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/wmrecord
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrecord/ChangeLog,v 1.1 2004/07/19 08:13:38 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrecord/ChangeLog,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
+
+*wmrecord-1.0.5.3-r1 (10 Jul 2005)
+
+  10 Jul 2005; Jonathan Smith <smithj@gentoo.org> -wmrecord-1.0.5.3.ebuild,
+  +wmrecord-1.0.5.3-r1.ebuild:
+  #98514: fixes man-page installation location
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmrecord-1.0.5.3.ebuild:
+  Stable for x86.
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> wmrecord-1.0.5.3.ebuild:
+  Added to ~ppc.
 
 *wmrecord-1.0.5.3 (19 Jul 2004)
 
diff --git a/x11-plugins/wmrecord/Manifest b/x11-plugins/wmrecord/Manifest
index 6e15f3bde52a..423c4f9453b2 100644
--- a/x11-plugins/wmrecord/Manifest
+++ b/x11-plugins/wmrecord/Manifest
@@ -1,5 +1,15 @@
-MD5 877aea0f62a0c67ef83859c5700f1732 wmrecord-1.0.5.3.ebuild 697
-MD5 87722bba1e1f9b4cdebd3b2f16052451 ChangeLog 456
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fe32f9f4cba717e959f324a8786fe893 ChangeLog 760
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 f5817c0145f7a887133f4977d1cdc71b wmrecord-1.0.5.3-r1.ebuild 887
 MD5 6a432086c96f663c66d6c88c74c2acc0 files/wmrecord.desktop 207
-MD5 1c822fc717f6fa493a76d5b9a0b7eea2 files/digest-wmrecord-1.0.5.3 76
+MD5 1c822fc717f6fa493a76d5b9a0b7eea2 files/digest-wmrecord-1.0.5.3-r1 76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0IOgl5AvwDPiUowRAsKsAKCS6UPpxx0N2PHDWKzmVozAGi2KEACgpW0r
+XxNLcSJLHcQk3qI/w37coFw=
+=s9cG
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
index 324f2730622c..bc2fa9acf66c 100644
--- a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild,v 1.1 2005/07/10 02:10:22 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmrecord/wmrecord-1.0.5.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:46 chriswhite Exp $
 
 IUSE=""
 
diff --git a/x11-plugins/wmsensormon/ChangeLog b/x11-plugins/wmsensormon/ChangeLog
index cd26af2584c4..1ea8d2ed9f3b 100644
--- a/x11-plugins/wmsensormon/ChangeLog
+++ b/x11-plugins/wmsensormon/ChangeLog
@@ -1,9 +1,55 @@
 # ChangeLog for x11-plugins/wmsensormon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/ChangeLog,v 1.1 2003/01/28 22:46:48 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmsensormon-1.2.1.ebuild:
+  removed COPYING and INSTALL from dodoc.
+
+  07 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmsensormon-1.2.0.ebuild:
+  Wiped out older version.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> wmsensormon-1.2.1.ebuild:
+  stable on amd64
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  wmsensormon-1.2.1.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  wmsensormon-1.2.0.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  29 Jan 2005; Michele Noberasco <s4t4n@gentoo.org> +wmsensormon-1.2.1.ebuild:
+  Stable for x86. Update copyright headers.
+  wmsensormon-1.2.0.ebuild:
+  Update copyright headers.
+
+*wmsensormon-1.2.1 (24 Dec 2004)
+
+  24 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> +wmsensormon-1.2.1.ebuild:
+  Version bump. Closing bug #75452.
+  -wmsensormon-1.2_beta.ebuild:
+  Removed older version.
+
+  06 Nov 2004; <pyrania@gentoo.org> wmsensormon-1.2.0.ebuild:
+  Fixed bug #70141. Thanks to Matt Taylor <liverbugg@juno.com>.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmsensormon-1.2.0.ebuild:
+  Stable on amd64.
+
+  29 Sep 2004; <pyrania@gentoo.org> wmsensormon-1.2.0.ebuild:
+  Marked stable on x86.
+
+*wmsensormon-1.2.0 (13 Jun 2004)
+
+  13 Jun 2004; <pyrania@gentoo.org> +wmsensormon-1.2.0.ebuild:
+  Version bump. Closing bug #51894.
 
 *wmsensormon-1.2_beta (28 Jan 2003)
 
+  02 apr 2003; <spider@gentoo.org> wmsensormon-1.2_beta.ebuild:
+  removed xpm dependency, bug 1446
+
   28 Jan 2003; Nick Hadaway <raker@gentoo.org> wmsensormon-1.2_beta.ebuild,
   files/digest-wmsensormon-1.2_beta :
   New ebuild.
diff --git a/x11-plugins/wmsensormon/Manifest b/x11-plugins/wmsensormon/Manifest
index e69de29bb2d1..107972d3fb2d 100644
--- a/x11-plugins/wmsensormon/Manifest
+++ b/x11-plugins/wmsensormon/Manifest
@@ -0,0 +1,4 @@
+MD5 19cafbcc3aff37202e1b41dfc0bfc631 wmsensormon-1.2.1.ebuild 829
+MD5 f5746b1153da90a4287ffcbbb13930b5 ChangeLog 1933
+MD5 d5b96897c2047239f4fa533645e2e0a8 metadata.xml 463
+MD5 f9aa05ab027067c310ec6aff0dfeb0d6 files/digest-wmsensormon-1.2.1 68
diff --git a/x11-plugins/wmsensormon/metadata.xml b/x11-plugins/wmsensormon/metadata.xml
index 32fc5311a986..9c27b3eb6f7c 100644
--- a/x11-plugins/wmsensormon/metadata.xml
+++ b/x11-plugins/wmsensormon/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
@@ -7,7 +5,7 @@
 <longdescription>
 Wmsensormon is a dockapp for Window Maker that utilizes lm_sensors to monitor 
 CPU temp, sys temp, fan speeds, and CPU voltage. It offers configurable 
-warnings for over�heating, and the sensors displayed are adjustible by the user 
+warnings for over-heating, and the sensors displayed are adjustible by the user
 with commandline parameters.
 </longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild b/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild
index 3593035e8786..53e890a70c5b 100644
--- a/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild
+++ b/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild,v 1.1 2004/12/24 08:28:58 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
 
 IUSE=""
 S=${WORKDIR}/${P/_/-}/${PN}
@@ -9,9 +9,9 @@ SRC_URI="mirror://sourceforge/wmsensormon/${P/_/-}.tar.gz"
 HOMEPAGE="http://wmsensormon.sourceforge.net"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 DEPEND="virtual/x11
-	>=sys-apps/lm-sensors-2.8.7"
+	>=sys-apps/lm_sensors-2.8.7"
 
 src_compile() {
 	cd ${S}
@@ -27,5 +27,5 @@ src_install () {
 	#unbzip manpage - Will be updated in 1.2 release
 	doman wmsensormon.1
 	cd ..
-	dodoc CHANGELOG COPYING INSTALL README TODO
+	dodoc CHANGELOG README TODO
 }
diff --git a/x11-plugins/wmseti/ChangeLog b/x11-plugins/wmseti/ChangeLog
index d92aa1449a96..e220f9800d36 100644
--- a/x11-plugins/wmseti/ChangeLog
+++ b/x11-plugins/wmseti/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/wmseti
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmseti/ChangeLog,v 1.1 2004/03/13 22:52:24 pyrania Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmseti/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  10 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmseti-1.0.3.ebuild:
+  Removed INSTALL from dodoc.
+
+  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> wmseti-1.0.3.ebuild:
+  added ~amd64 KEYWORD, fixes #83856
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmseti-1.0.3.ebuild:
+  Added ~sparc keyword.
+
+  27 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmseti-1.0.3.ebuild:
+  Fix ebuild header; bump to stable for x86.
 
 *wmseti-1.0.3 (13 Mar 2004)
 
diff --git a/x11-plugins/wmseti/Manifest b/x11-plugins/wmseti/Manifest
index f694cb525d27..a29c7a1970d0 100644
--- a/x11-plugins/wmseti/Manifest
+++ b/x11-plugins/wmseti/Manifest
@@ -1,2 +1,4 @@
-MD5 142a39901e736c4cd5d7ff6153607aca wmseti-1.0.3.ebuild 494
+MD5 eaaa211b8c15dc9d70bdead134acaa0b wmseti-1.0.3.ebuild 597
+MD5 429bfb5066108d69a340a996d88ba659 ChangeLog 789
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 fcab103d1ef88063a3eeced90e54bcaf files/digest-wmseti-1.0.3 64
diff --git a/x11-plugins/wmseti/wmseti-1.0.3.ebuild b/x11-plugins/wmseti/wmseti-1.0.3.ebuild
index 42771d979a62..70e9cfab1c0c 100644
--- a/x11-plugins/wmseti/wmseti-1.0.3.ebuild
+++ b/x11-plugins/wmseti/wmseti-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmseti/wmseti-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 IUSE=""
 
@@ -10,12 +10,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://wmseti.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 LICENSE="GPL-2"
 
 DEPEND="virtual/x11"
 
 src_install () {
 	einstall || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/x11-plugins/wmsetimon/ChangeLog b/x11-plugins/wmsetimon/ChangeLog
index 4dc2cd33d916..857ae4abecd5 100644
--- a/x11-plugins/wmsetimon/ChangeLog
+++ b/x11-plugins/wmsetimon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmsetimon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsetimon/ChangeLog,v 1.1 2005/01/08 01:07:31 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsetimon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  08 Feb 2005; Michele Noberasco <s4t4n@gentoo.org> wmsetimon-0.5.ebuild:
+  Stable for x86.
 
 *wmsetimon-0.5 (08 Jan 2005)
 
diff --git a/x11-plugins/wmsetimon/Manifest b/x11-plugins/wmsetimon/Manifest
index 548dff8e043e..50068c26f77e 100644
--- a/x11-plugins/wmsetimon/Manifest
+++ b/x11-plugins/wmsetimon/Manifest
@@ -1,4 +1,4 @@
-MD5 c8d9fbce2212a1ee5c9442a42d0fd6bb wmsetimon-0.5.ebuild 647
-MD5 0e060712cc2f9e65af472b5a95e139ba ChangeLog 279
+MD5 4d2a6819ec3ee794f2caba3551f35d18 wmsetimon-0.5.ebuild 749
+MD5 5a37233bf45a9ff0084f7c6d38edc3bf ChangeLog 464
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 6ca31313cdb092013b50ed25bf0f2118 files/digest-wmsetimon-0.5 64
diff --git a/x11-plugins/wmsetimon/wmsetimon-0.5.ebuild b/x11-plugins/wmsetimon/wmsetimon-0.5.ebuild
index e5dfd4ec7c94..cf1a295e829e 100644
--- a/x11-plugins/wmsetimon/wmsetimon-0.5.ebuild
+++ b/x11-plugins/wmsetimon/wmsetimon-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsetimon/wmsetimon-0.5.ebuild,v 1.1 2005/01/08 01:07:31 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsetimon/wmsetimon-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 IUSE=""
 S=${WORKDIR}/${PN}/${PN}
@@ -9,7 +9,7 @@ SRC_URI="http://goupilfr.org/arch/${P}.tar.gz"
 HOMEPAGE="http://goupilfr.org/?soft=wmsetimon"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 DEPEND="virtual/x11
 	>=sys-apps/sed-4"
 
diff --git a/x11-plugins/wmsmixer/ChangeLog b/x11-plugins/wmsmixer/ChangeLog
index c193df730c04..ab2ad677cd90 100644
--- a/x11-plugins/wmsmixer/ChangeLog
+++ b/x11-plugins/wmsmixer/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for x11-plugins/wmsmixer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.1 2002/10/04 16:05:45 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
+
+  16 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmsmixer-0.5.1.ebuild,
+  wmsmixer-0.5.ebuild:
+  Updated HOMEPAGE, closes #101187.
+
+  02 Aug 2005; Markus Rothe <corsair@gentoo.org> wmsmixer-0.5.1.ebuild:
+  Stable on ppc64
+
+  02 Jul 2005; Markus Rothe <corsair@gentoo.org> wmsmixer-0.5.1.ebuild:
+  added ~ppc64
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmsmixer-0.5.1.ebuild:
+  Stable on amd64.
+
+*wmsmixer-0.5.1 (30 June 2004)
+
+  08 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmsmixer-0.5.1.ebuild:
+  Stable for x86. The -m32 removal works fine for me...
+
+  06 Jul 2004; <augustus@gentoo.org> wmsmixer-0.5.1.ebuild:
+  I don't know why -m32 was defined but it was not needed and broke amd64
+  support.  Please comment if this breaks anyone else's arch.
+
+  01 Jul 2004; David Holm <dholm@gentoo.org> wmsmixer-0.5.1.ebuild:
+  Added to ~ppc.
+
+  30 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmsmixer-0.5.1.ebuild:
+  Version Bump. No longer need for gcc3.diff as the problem
+  was fixed upstream. wmsmixer now installs in /usr/bin/ instead
+  of /usr/X11R6/bin/
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmsmixer-0.5.ebuild:
+  glibc -> libc
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> wmsmixer-0.5.ebuild:
+  Added ~sparc keyword.
+
+  19 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wmsmixer-0.5.ebuild:
+  Inherit eutils.
+
+  11 Dec 2003; Markus Nigbur <pyrania@gentoo.org> wmsmixer-0.5.ebuild:
+  Fixed permission problem. Thanks to Minati jean michel (bug 22983)
+
+  17 Oct 2003; Nick hadaway <raker@gentoo.org> wmsmixer-0.5.ebuild:
+  Reworked the ebuild again. :)
+
+  05 Jun 2003; robh <robh@gentoo.org> files/makefile.diff:
+  corrected diff. thanks to: Georgi Georgiev <chutz@chubaka.net>
+  closes #16385.
 
 *wmsmixer-0.5 (04 Oct 2002)
 
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index e69de29bb2d1..663c6624d601 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -0,0 +1,7 @@
+MD5 3153bd17363c79cd389da01cbba2dfc0 wmsmixer-0.5.ebuild 882
+MD5 259a8988bdff895f9efbe4a0954b7303 ChangeLog 2143
+MD5 cbcbfa5899b062c064cd902ba13c1f89 metadata.xml 380
+MD5 3ff54480da4d3353f385f2b78c62033d wmsmixer-0.5.1.ebuild 813
+MD5 2a88cef104773c371d0b8d96362d47d5 files/digest-wmsmixer-0.5 63
+MD5 3ef0320fe7b417f8464b2a74981a814b files/digest-wmsmixer-0.5.1 65
+MD5 2888240d41fcb8a0569feba2cb252dfa files/gcc3.diff 398
diff --git a/x11-plugins/wmsmixer/metadata.xml b/x11-plugins/wmsmixer/metadata.xml
index c56858a0d614..604b037085ff 100644
--- a/x11-plugins/wmsmixer/metadata.xml
+++ b/x11-plugins/wmsmixer/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
index 7e77eecc63e7..0efe536e4401 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild,v 1.1 2004/06/30 08:25:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
 inherit eutils
 IUSE=""
 DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
-HOMEPAGE="http://www.hibernaculum.net/wmsmixer.html"
+HOMEPAGE="http://www.hibernaculum.net/wmsmixer/index.php"
 SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 
 DEPEND="virtual/libc
 	virtual/x11"
 
 src_compile() {
-	g++ -m32 ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
+	g++ ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
 	rm -f wmsmixer
 	g++ -o wmsmixer ${CFLAGS} -L/usr/X11R6/lib wmsmixer.o -lXpm -lXext -lX11
 }
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild
index 74bf6701c562..299a8d04fc59 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild
@@ -1,41 +1,35 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild,v 1.1 2002/10/04 16:05:45 raker Exp $
-
-S="${WORKDIR}/${P}"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
+inherit eutils
+IUSE=""
 DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
-HOMEPAGE="http://www.hibernaculum.net/wmsmixer.html"
+HOMEPAGE="http://www.hibernaculum.net/wmsmixer/index.php"
 SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ~sparc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11"
-RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/gcc3.diff || die "patch failed"
-
+	epatch ${FILESDIR}/gcc3.diff
 }
 
 src_compile() {
-
-	xmkmf || die "xmkmf failed"
-
-	patch -p0 < ${FILESDIR}/makefile.diff
-
-	make || die "parallel make failed"
-
+	g++ -m32 ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
+	rm -f wmsmixer
+	g++ -o wmsmixer ${CFLAGS} -L/usr/X11R6/lib wmsmixer.o -lXpm -lXext -lX11
 }
 
 src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
+	insinto /usr/X11R6/bin
+	insopts -m0655
+	doins wmsmixer
+	dodoc README README.wmmixer
 }
diff --git a/x11-plugins/wmsound/ChangeLog b/x11-plugins/wmsound/ChangeLog
index 70b7e026612c..37c07983dd4a 100644
--- a/x11-plugins/wmsound/ChangeLog
+++ b/x11-plugins/wmsound/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmsound
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.1 2004/07/22 01:12:31 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+  30 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmsound-0.9.5.ebuild:
+  Apply esd patch only if esd USE flag is enabled. Closes bug #87223.
+
+  01 Oct 2004; <pyrania@gentoo.org> wmsound-0.9.5.ebuild:
+  Marked stable on x86.
+
+  22 Jul 2004; David Holm <dholm@gentoo.org> wmsound-0.9.5.ebuild:
+  Added to ~ppc.
 
 *wmsound-0.9.5 (22 Jul 2004)
 
diff --git a/x11-plugins/wmsound/Manifest b/x11-plugins/wmsound/Manifest
index 09aba1bf189f..994d8b478f85 100644
--- a/x11-plugins/wmsound/Manifest
+++ b/x11-plugins/wmsound/Manifest
@@ -1,4 +1,6 @@
-MD5 20a66487f1ad6a88f040b13817d154c2 wmsound-0.9.5.ebuild 995
+MD5 572daff455937ba257c0c60d632469d5 wmsound-0.9.5.ebuild 1135
+MD5 ac4c123fdd0b3d1bf53b67a164e2d239 ChangeLog 689
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 07c8b3d33fbbbed1700c4515b5311721 files/wmsound-esd.patch 2799
 MD5 56668c80d9f0b2b99b5c9088016ed62a files/digest-wmsound-0.9.5 64
 MD5 3bfb08591f212acd293b5f480afd4fab files/wmsound-config.patch 2466
diff --git a/x11-plugins/wmsound/wmsound-0.9.5.ebuild b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
index 0adb33471ba8..9669b0baa7c4 100644
--- a/x11-plugins/wmsound/wmsound-0.9.5.ebuild
+++ b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.1 2004/07/22 01:12:31 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 src_unpack()
 {
@@ -27,7 +27,7 @@ src_unpack()
 	cd ${S}
 	epatch ${FILESDIR}/wmsound-config.patch
 	epatch ${FILESDIR}/wmsound-ComplexProgramTargetNoMan.patch
-	epatch ${FILESDIR}/wmsound-esd.patch
+	use esd && epatch ${FILESDIR}/wmsound-esd.patch
 }
 
 src_compile()
diff --git a/x11-plugins/wmspaceclock/ChangeLog b/x11-plugins/wmspaceclock/ChangeLog
index 0952305e7cbc..8fbaf6b51884 100644
--- a/x11-plugins/wmspaceclock/ChangeLog
+++ b/x11-plugins/wmspaceclock/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for x11-plugins/wmspaceclock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/ChangeLog,v 1.1 2003/01/14 22:43:21 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/ChangeLog,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
+
+  24 Nov 2004; Jason Wever <weeve@gentoo.org> wmspaceclock-1.2d.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmspaceclock-1.2d.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmspaceclock-1.2d.ebuild:
+  Masked wmspaceclock-1.2d.ebuild stable for ppc
+
+  25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmspaceclock-1.2d.ebuild:
+  Stable on x86.
+
+  23 Jul 2004; David Holm <dholm@gentoo.org> wmspaceclock-1.2d.ebuild:
+  Added to ~ppc.
+
+*wmspaceclock-1.2d (22 Jul 2004)
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmspaceclock-1.2d.ebuild:
+  Version bump.
+  wmspaceclock-1.2b.ebuild:
+  Stable for x86.
+  wmspaceclock-1.1.ebuild:
+  Remove old ebuilds.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmspaceclock-1.1.ebuild,
+  wmspaceclock-1.2b.ebuild:
+  glibc -> libc, add sed-4 dep
+
+*wmspaceclock-1.2b (17 May 2003)
+
+  17 May 2003; Martin Holzer <mholzer@gentoo.org> wmspaceclock-1.2b.ebuild:
+  Version bumped. Closes #17631.
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> wmspaceclock-1.1.ebuild :
+  Removed the WindowMaker DEPEND.
 
 *wmspaceclock-1.1 (14 Jan 2003)
 
diff --git a/x11-plugins/wmspaceclock/Manifest b/x11-plugins/wmspaceclock/Manifest
index 91a466425386..481190187d22 100644
--- a/x11-plugins/wmspaceclock/Manifest
+++ b/x11-plugins/wmspaceclock/Manifest
@@ -1,6 +1,6 @@
-MD5 1d8acf05773da8e9bed86351e20dd30a ChangeLog 506
-MD5 7f93432db3080d3e74e0f11b619c52f8 wmspaceclock-1.1.ebuild 785
-MD5 d3f1acd7e4c8556f2453be4694a004d2 attachment.cgi?id=9463 768
-MD5 1d73a4a618380eb6f0c17affbe16903e wmspaceclock-1.2b.ebuild 727
-MD5 273d312e95c3a9f485649e4e65106592 files/digest-wmspaceclock-1.1 66
+MD5 1752d78a48d20ecd95c322f174c48d05 ChangeLog 1516
+MD5 22920e4561ba95417c861c5f0f495bd6 metadata.xml 461
+MD5 4248b951d6a6f59e918646c8d1af5bc2 wmspaceclock-1.2b.ebuild 742
+MD5 7a34a9534f07defcf035c3754f4ce307 wmspaceclock-1.2d.ebuild 918
+MD5 dfdfd55daef0e7dd9675b4f674282846 files/digest-wmspaceclock-1.2d 67
 MD5 d494f3f060141ab4baefd1fc2aa33823 files/digest-wmspaceclock-1.2b 67
diff --git a/x11-plugins/wmspaceclock/metadata.xml b/x11-plugins/wmspaceclock/metadata.xml
index d483b9544f0c..2948906efc69 100644
--- a/x11-plugins/wmspaceclock/metadata.xml
+++ b/x11-plugins/wmspaceclock/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild b/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild
index 76d000f4dac7..debf036f1d5c 100644
--- a/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild
+++ b/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild,v 1.1 2003/05/17 11:04:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 DESCRIPTION="A sexy anti-aliased dockapp clock"
 HOMEPAGE="http://wmspaceclock.sourceforge.net"
 SRC_URI="mirror://sourceforge/wmspaceclock/${P/wm/}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
-	>=media-libs/gdk-pixbuf-0.20"
+	>=media-libs/gdk-pixbuf-0.20
+	>=sys-apps/sed-4"
 S=${WORKDIR}/spaceclock
 
 src_compile() {
 	cd ${S}
 	sed	-i "s:/usr/local:/usr:" Makefile
 	sed	-i "s:-g3 -O2:${CFLAGS}:" Makefile
-    ./configure
+	./configure
 	make
 }
 
diff --git a/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild b/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild
index 8f735a6d43b6..752079cceb4c 100644
--- a/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild
+++ b/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild,v 1.1 2004/07/22 09:22:55 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild,v 1.1.1.1 2005/11/30 10:10:55 chriswhite Exp $
 
 DESCRIPTION="A sexy anti-aliased dockapp clock"
 HOMEPAGE="http://wmspaceclock.sourceforge.net"
 SRC_URI="mirror://sourceforge/wmspaceclock/${P/wm/}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ppc ~sparc"
 IUSE=""
 DEPEND="virtual/libc
 	virtual/x11
diff --git a/x11-plugins/wmsvencd/ChangeLog b/x11-plugins/wmsvencd/ChangeLog
index 5b3244a29204..39dba91c105a 100644
--- a/x11-plugins/wmsvencd/ChangeLog
+++ b/x11-plugins/wmsvencd/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for x11-plugins/wmsvencd
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsvencd/ChangeLog,v 1.1 2004/07/17 13:54:27 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsvencd/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmsvencd-0.5.0.ebuild:
+  Stable for x86...
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> :
+  Added to ~ppc.
 
 *wmsvencd-0.5.0 (17 Jul 2004)
 
   17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmsvencd-0.5.0.ebuild:
   Initial import. Thanks to Przemyslaw Maciag. Closes #53583.
+  Remove the S definition...
diff --git a/x11-plugins/wmsvencd/Manifest b/x11-plugins/wmsvencd/Manifest
index 800cb72e5f6d..31a61f3c47d6 100644
--- a/x11-plugins/wmsvencd/Manifest
+++ b/x11-plugins/wmsvencd/Manifest
@@ -1,4 +1,6 @@
-MD5 5834e7daed0aa49de9a210650a7080ad wmsvencd-0.5.0.ebuild 789
+MD5 fca9d4fa3bfb59281a0b68b930c9a557 wmsvencd-0.5.0.ebuild 869
+MD5 19315d627d0736bb121c206d018a324d ChangeLog 570
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 813d128fc4aa6314fb517d9c3d9e5af7 files/wmsvencd-compile.patch 1214
 MD5 106258cb0439850d80bb5bde262f5bce files/digest-wmsvencd-0.5.0 65
 MD5 70eabdb0f90dd2777380a1952ef3d9c3 files/wmsvencd.desktop 232
diff --git a/x11-plugins/wmsvencd/wmsvencd-0.5.0.ebuild b/x11-plugins/wmsvencd/wmsvencd-0.5.0.ebuild
index 8e51227c09c1..8dda75da98f6 100644
--- a/x11-plugins/wmsvencd/wmsvencd-0.5.0.ebuild
+++ b/x11-plugins/wmsvencd/wmsvencd-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsvencd/wmsvencd-0.5.0.ebuild,v 1.1 2004/07/17 13:54:27 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsvencd/wmsvencd-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:38 chriswhite Exp $
 
 inherit eutils
 
@@ -16,9 +16,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-S=${WORKDIR}/${P}
+KEYWORDS="x86 ~ppc"
 
 src_unpack() {
 
diff --git a/x11-plugins/wmswallow/ChangeLog b/x11-plugins/wmswallow/ChangeLog
index e3ffdefdbe6e..8239dca511a4 100644
--- a/x11-plugins/wmswallow/ChangeLog
+++ b/x11-plugins/wmswallow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmswallow
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.1 2003/07/17 02:49:11 raker Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org>; wmswallow-0.6.1.ebuild:
+  Removed INSTALL and LICENSE from dodoc.
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmswallow-0.6.1.ebuild:
+  Changed dependency to virtual/x11 to work with x11-base/xorg-x11
 
 *wmswallow-0.6.1 (16 Jul 2003)
 
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
index 46ac3c0669ab..bb1923d3da25 100644
--- a/x11-plugins/wmswallow/Manifest
+++ b/x11-plugins/wmswallow/Manifest
@@ -1,3 +1,4 @@
-MD5 da2bf37f5194bc562130888b7a380e6b ChangeLog 284
-MD5 36ec2bda3e42d66e6d4929913cc19e7d wmswallow-0.6.1.ebuild 621
+MD5 0f14b847cb011315ce0990a3be4ecf8e ChangeLog 626
+MD5 e86d4130b9bc927ad4f33f551a8541ba metadata.xml 560
+MD5 1276b9cb861063c9a545d0b5d25754cf wmswallow-0.6.1.ebuild 708
 MD5 4dac6dda847dcd465cc6a8666535394a files/digest-wmswallow-0.6.1 59
diff --git a/x11-plugins/wmswallow/metadata.xml b/x11-plugins/wmswallow/metadata.xml
index b178fb9644a0..50d126d55f8d 100644
--- a/x11-plugins/wmswallow/metadata.xml
+++ b/x11-plugins/wmswallow/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
index 47d4b693c499..7e1de6d792c8 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # 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.1 2003/07/17 02:49:11 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmswallow/wmswallow-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:48 chriswhite 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"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 
-DEPEND="x11-base/xfree"
+DEPEND="virtual/x11"
 
 S=${WORKDIR}/wmswallow
 
@@ -24,6 +24,6 @@ src_install() {
 	insinto /usr/bin
 	doins wmswallow
 	fperms 755 /usr/bin/wmswallow
-	dodoc CHANGELOG INSTALL LICENSE README README.solaris todo
+	dodoc CHANGELOG README README.solaris todo
 }
 
diff --git a/x11-plugins/wmsysmon/ChangeLog b/x11-plugins/wmsysmon/ChangeLog
index 02cae8384584..327bd6e6714b 100644
--- a/x11-plugins/wmsysmon/ChangeLog
+++ b/x11-plugins/wmsysmon/ChangeLog
@@ -1,7 +1,74 @@
 # ChangeLog for x11-plugins/wmsysmon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmsysmon-0.7.6-r3.ebuild:
+  Removed COPYING from dodoc.
+
+  08 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmsysmon-0.7.6-r3.ebuild:
+  Moved large patch to distfiles. Updated copyright headers.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  13 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmsysmon-0.7.6-r1.ebuild,
+  wmsysmon-0.7.6-r2.ebuild:
+  Remove older ebuilds...
+
+  09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  wmsysmon-0.7.6-r3.ebuild:
+  Stable on alpha.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmsysmon-0.7.6-r3.ebuild:
+  Stable on amd64.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmsysmon-0.7.6-r3.ebuild:
+  stable on ppc64, bug #62258
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmsysmon-0.7.6-r2.ebuild, wmsysmon-0.7.6-r3.ebuild:
+  Masked wmsysmon-0.7.6-r3.ebuild stable for ppc
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmsysmon-0.7.6-r2.ebuild:
+  Masked wmsysmon-0.7.6-r2.ebuild stable for ppc
+
+  20 Aug 2004; Jason Wever <weeve@gentoo.org> wmsysmon-0.7.6-r3.ebuild:
+  Stable on sparc.
+
+*wmsysmon-0.7.6-r3 (August 02 2004)
+
+  02 Aug 2004; Michele Noberasco <s4t4n@gentoo.org>
+  wmsysmon-0.7.6-r3.ebuild, wmsysmon-0.7.6-high-ints.patch:
+  New patch to add support for minitoring 24 interrupts in Makefile.
+  New revision that makes use of alpha and high-ints USE flags
+  to decide wether to enable 24 interruputs monitoring support.
+  wmsysmon-0.7.6-r2.ebuild, files/wmsysmon-0.7.6-s4t4n.patch:
+  Change s4t4n patch to better handle CFLAGS stuff.
+  Change ebuild not to DEPEND on sed and still honour Gentoo CFLAGS.
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> wmsysmon-0.7.6-r2.ebuild:
+  Stable on alpha.
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmsysmon-0.7.6-r2.ebuild:
+  Added to ~ppc.
+
+*wmsysmon-0.7.6-r2 (July 17 2004)
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmsysmon-0.7.6-r2.ebuild:
+  Revision bump, solves #48851, allowing wmsysmon to be run with 2.4 and 2.6
+  kernels and get all the correct stats. Substitute I/O troughtput with
+  CPU usage. Stable for x86 (I have been running with this patch forever now).
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmsysmon-0.7.6-r1.ebuild:
+  add sed-4 dep
+
+  20 Oct 2003; Nick Hadaway <raker@genroo.org> wmsysmon-7.6-r1.ebuild,
+  files/fanta.diff:
+  Addressing bug #27499. :)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmsysmon-0.7.6-r1 (June 24 2002)
  
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest
index e69de29bb2d1..1e3aea423530 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -0,0 +1,5 @@
+MD5 52dd5a94f6a3d67526b1e94edb062cdf wmsysmon-0.7.6-r3.ebuild 1019
+MD5 36c4a7e0de58c0e6e1fefe98d85c0228 ChangeLog 3220
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 5450d44337955ab76a071ee4927d693d files/digest-wmsysmon-0.7.6-r3 138
+MD5 f92c36a3e2cda76a531745835a0bb145 files/wmsysmon-0.7.6-high-ints.patch 489
diff --git a/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r3 b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r3
index 251f0cd76a3e..0bfd5421739e 100644
--- a/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r3
+++ b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r3
@@ -1 +1,2 @@
 MD5 1f8b7872c20fa6af1c89265ea2126c31 wmsysmon-0.7.6.tar.gz 22792
+MD5 fc96ca7b10219349e99cd3087f9d3513 wmsysmon-0.7.6-s4t4n.patch.bz2 8810
diff --git a/x11-plugins/wmsysmon/metadata.xml b/x11-plugins/wmsysmon/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmsysmon/metadata.xml
+++ b/x11-plugins/wmsysmon/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild
index 0e9813967119..850f2b719b3e 100644
--- a/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild,v 1.1 2004/08/02 12:07:02 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
 
 inherit eutils
 
 IUSE="high-ints"
 DESCRIPTION="WMaker DockUp to monitor: CPU, Memory, Swap usage, system uptime, hardware interrupts, paging and swap activity."
-SRC_URI="http://www.gnugeneration.com/software/wmsysmon/src/${P}.tar.gz"
+SRC_URI="http://www.gnugeneration.com/software/wmsysmon/src/${P}.tar.gz
+	mirror://gentoo/${P}-s4t4n.patch.bz2"
 HOMEPAGE="http://www.gnugeneration.com/software/wmsysmon/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~alpha ~amd64 ~ppc"
+KEYWORDS="x86 sparc alpha amd64 ppc ppc64"
 
 DEPEND="virtual/x11"
 
@@ -20,7 +21,7 @@ src_unpack()
 	cd ${S}
 
 	# bug 48851
-	epatch ${FILESDIR}/${P}-s4t4n.patch
+	epatch ${WORKDIR}/${P}-s4t4n.patch
 
 	# Monitor all the 24 interrupts on alpha and x86 SMP machines
 	if use alpha || use high-ints; then
@@ -37,5 +38,5 @@ src_compile()
 src_install ()
 {
 	dobin src/wmsysmon
-	dodoc COPYING ChangeLog FAQ README
+	dodoc ChangeLog FAQ README
 }
diff --git a/x11-plugins/wmsystray/ChangeLog b/x11-plugins/wmsystray/ChangeLog
index cc8a9a42c144..bf75bb8f2816 100644
--- a/x11-plugins/wmsystray/ChangeLog
+++ b/x11-plugins/wmsystray/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-plugins/wmsystray
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/ChangeLog,v 1.1 2004/07/17 11:25:37 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+  25 Jul 2005; Simon Stelling <blubb@gentoo.org> wmsystray-0.1.1.ebuild:
+  stable on amd64
+
+  26 Jun 2005; Simon Stelling <blubb@gentoo.org> wmsystray-0.1.1.ebuild:
+  added ~amd64 keyword
+
+  25 Nov 2004; Jason Wever <weeve@gentoo.org> wmsystray-0.1.1.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmsystray-0.1.1.ebuild:
+  Masked wmsystray-0.1.1.ebuild stable for ppc
+
+  26 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmsystray-0.1.1.ebuild:
+  Add patch to fix #61704. Stable for x86...
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> wmsystray-0.1.1.ebuild:
+  Added to ~ppc.
 
 *wmsystray-0.1.1 (17 Jul 2004)
 
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 9e30b37ce34b..c1da290f1b5b 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -1,4 +1,7 @@
-MD5 e96fd5d6b2501d73f6063ed13243049a wmsystray-0.1.1.ebuild 667
-MD5 91c60c856956631ac35d934b07350aaa files/wmsystray.desktop 208
-MD5 34195165ec752a9c8fcfda9a233d49cc files/wmsystray-cflags.patch 1149
+MD5 c0a68f4e1f9db61d4fdfe9428f7967fe ChangeLog 1010
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 abebe7c24ce1b90c5c74737daa5e186b wmsystray-0.1.1.ebuild 1086
 MD5 5ae5e34c8af6dd925d3e5c6778e2c6ff files/digest-wmsystray-0.1.1 67
+MD5 34195165ec752a9c8fcfda9a233d49cc files/wmsystray-cflags.patch 1149
+MD5 c0df4c20ac27375666dbb28ae85281af files/wmsystray-gcc-3.4.patch 270
+MD5 91c60c856956631ac35d934b07350aaa files/wmsystray.desktop 208
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
index 14cbb0bfeef9..2168e98cf34b 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild,v 1.1 2004/07/17 11:25:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 inherit eutils
 
@@ -15,14 +15,20 @@ RDEPEND=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 src_unpack() {
 
 	unpack ${A}
 	cd ${S}
+
+	# Let's honour Gentoo CFLAGS
 	epatch ${FILESDIR}/${PN}-cflags.patch
 
+	# Fix for #61704, cannot compile with gcc 3.4.1:
+	# it's a trivial change and does not affect other compilers...
+	epatch ${FILESDIR}/${PN}-gcc-3.4.patch
+
 }
 
 src_compile() {
diff --git a/x11-plugins/wmtimer/ChangeLog b/x11-plugins/wmtimer/ChangeLog
index 65e5106c454b..5cfcc0d2ce0e 100644
--- a/x11-plugins/wmtimer/ChangeLog
+++ b/x11-plugins/wmtimer/ChangeLog
@@ -1,8 +1,55 @@
 # ChangeLog for x11-plugins/wmtimer
-# Copyright 2001-2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.1 2002/09/16 16:14:04 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
-* wmtimer-2.4 (12 August 2002)
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> wmtimer-2.9.2.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> wmtimer-2.9.2.ebuild:
+  Stable on ppc.
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmtimer-2.9.2.ebuild:
+  stable for x86.
+
+*wmtimer-2.9.2 (14 March 2004)
+
+  14 Mar 2004; Michele Noberasco <s4t4n@gentoo.org> wmtimer-2.9.2.ebuild:
+  Version bump. Closes #84982, reported by André-Sebastian Liebe.
+  wmtimer-2.4.ebuild:
+  Updated copyright headers.
+
+  25 Nov 2004; Jason Wever <weeve@gentoo.org> wmtimer-2.4.ebuild:
+  Added ~sparc keyword.
+
+  23 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> wmtimer-2.4.ebuild:
+  Removing unneccessary dodoc docs.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmtimer-2.4.ebuild:
+  Masked wmtimer-2.4.ebuild stable for ppc
+
+  31 Aug 2004; Tom Gall <tgall@gentoo.org> wmtimer-2.4.ebuild:
+  stable on ppc64, bug #61765
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmtimer-2.4.ebuild:
+  glibc -> libc, add sed-4 dep
+
+  11 Jan 2004; Ian Leitch <port001@gentoo.org> wmtimer-2.4.ebuild:
+  Fixed incorrect negation of directories (#37647), added IUSE, split x11 and
+  gtk into RDEPEND
+
+*wmtimer-2.4 (12 August 2002)
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> wmtimer-2.4.ebuild :
+  Automated cleanup of LICENSE
+
+  07 Oct 2002; Nick Hadaway <raker@gentoo.org> wmtimer-2.4.ebuild :
+  Adding missing dependancy on x11-libs/gtk+-1.2*
+
+  04 Oct 2002; Nick Hadaway <raker@gentoo.org> wmtimer-2.4.ebuild :
+  Added CFLAG optimizations and cleaned up src_install()
 
   16 Sep 2002; Nick Hadaway <raker@gentoo.org> :
   Moved from app-misc to x11-plugins.
diff --git a/x11-plugins/wmtimer/Manifest b/x11-plugins/wmtimer/Manifest
index e69de29bb2d1..0a49d74ce427 100644
--- a/x11-plugins/wmtimer/Manifest
+++ b/x11-plugins/wmtimer/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 290dd14159cae2d72a89736690aba6f0 wmtimer-2.4.ebuild 793
+MD5 29dad15b2d403e1f5225ef8b26e8baa3 metadata.xml 505
+MD5 4901d73b56fd6bd7ce89481a41b2fb64 wmtimer-2.9.2.ebuild 874
+MD5 5a60a0dd7c9fd78a6a05ef3b5896b172 ChangeLog 2191
+MD5 49cf497c9616c2dc6e57a24f096e9b07 files/digest-wmtimer-2.9.2 63
+MD5 e9893dea144b35a7eb054a48c737d0cc files/digest-wmtimer-2.4 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFDK2ktLLFUmVNQ7rkRAnaJAJ0VXVYm2Dom1oqEsnckw3/5fUqCXQCY+rRr
+wxrzBtFGzvgJe0+Bg7cUNg==
+=WG+p
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmtimer/metadata.xml b/x11-plugins/wmtimer/metadata.xml
index 2f4830f49afd..f35d31cbb343 100644
--- a/x11-plugins/wmtimer/metadata.xml
+++ b/x11-plugins/wmtimer/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmtimer/wmtimer-2.4.ebuild b/x11-plugins/wmtimer/wmtimer-2.4.ebuild
index 1973cd70add5..8e8623fecc9b 100644
--- a/x11-plugins/wmtimer/wmtimer-2.4.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.4.ebuild
@@ -1,28 +1,38 @@
-# 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-plugins/wmtimer/wmtimer-2.4.ebuild,v 1.1 2002/09/16 16:14:04 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# 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.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+IUSE=""
+
+S=${WORKDIR}/${P}/${PN}
 
-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"
-HOMEPAGE="http://home.dwave.net/~jking/wmtimer/"
+SRC_URI="http://www.darkops.net/wmtimer/${P}.tar.gz"
+HOMEPAGE="http://www.darkops.net/wmtimer/"
 
 SLOT="0"
-LICENSE="GPL"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ppc64 ppc ~sparc"
 
-DEPEND="virtual/x11"
-RDEPEND="${DEPEND}"
+RDEPEND="=x11-libs/gtk+-1.2*
+	virtual/x11"
+
+DEPEND="virtual/libc
+	${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:-O2 -Wall:${CFLAGS}:" Makefile
+}
 
 src_compile() {
-	cd ${S2}
 	emake || die
 }
 
 src_install () {
-	exeinto /usr/bin
-	doexe ${S2}/wmtimer
-	cd ${S}
-	dodoc README COPYING INSTALL  CREDITS INSTALL Changelog 
+	dobin wmtimer
+	cd ..
+	dodoc README CREDITS Changelog
 }
diff --git a/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild b/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild
index c7d4da216b32..9862e4c068ab 100644
--- a/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild,v 1.1 2005/03/14 15:20:03 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 IUSE=""
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.darkops.net/wmtimer/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="virtual/libc
 	virtual/x11
diff --git a/x11-plugins/wmtop/ChangeLog b/x11-plugins/wmtop/ChangeLog
index 9ce6fb7a3ded..d2e0248c4595 100644
--- a/x11-plugins/wmtop/ChangeLog
+++ b/x11-plugins/wmtop/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-plugins/wmtop
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/ChangeLog,v 1.1 2002/10/04 18:42:58 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/ChangeLog,v 1.1.1.1 2005/11/30 10:10:48 chriswhite Exp $
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmtop-0.84.ebuild:
+  glibc -> libc, add sed-4 dep
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> wmtop-0.84.ebuild:
+  Make stable on ppc
+  Thanks to Florian Daniel for the testing
+
+  24 Sep 2003; Jason Wever <weeve@gentoo.org> wmtop-0.84.ebuild:
+  Added ~sparc keyword.
 
 *wmtop-0.84 (04 Oct 2002)
 
diff --git a/x11-plugins/wmtop/Manifest b/x11-plugins/wmtop/Manifest
index e69de29bb2d1..49ad06f34539 100644
--- a/x11-plugins/wmtop/Manifest
+++ b/x11-plugins/wmtop/Manifest
@@ -0,0 +1,4 @@
+MD5 18d7c625c1ee7716e927b54dd31a1335 wmtop-0.84.ebuild 713
+MD5 c329839a9dca353b593e5dc4cfe3d6d9 ChangeLog 687
+MD5 4745e806b0b279d04fc25d2ff79cf4fa metadata.xml 555
+MD5 f02c38d61b457e6c4127eb64dcaa2715 files/digest-wmtop-0.84 62
diff --git a/x11-plugins/wmtop/metadata.xml b/x11-plugins/wmtop/metadata.xml
index bba11a89dd14..33ae69be06dd 100644
--- a/x11-plugins/wmtop/metadata.xml
+++ b/x11-plugins/wmtop/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmtop/wmtop-0.84.ebuild b/x11-plugins/wmtop/wmtop-0.84.ebuild
index 20d5de7f7aaf..c53d1aafc7ad 100644
--- a/x11-plugins/wmtop/wmtop-0.84.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.84.ebuild
@@ -1,30 +1,29 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2002/10/04 18:42:58 raker Exp $
-
-S="${WORKDIR}/${P}"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/wmtop-0.84.ebuild,v 1.1.1.1 2005/11/30 10:10:49 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="top in a dockapp"
 HOMEPAGE="http://wmtop.sourceforge.net"
 SRC_URI="mirror://sourceforge/wmtop/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc amd64 ppc"
 
-DEPEND="virtual/glibc
-	virtual/x11"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc
+	virtual/x11
+	>=sys-apps/sed-4"
 
-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/wmtz/ChangeLog b/x11-plugins/wmtz/ChangeLog
index a8e959569dc3..f4111e1502aa 100644
--- a/x11-plugins/wmtz/ChangeLog
+++ b/x11-plugins/wmtz/ChangeLog
@@ -1,9 +1,41 @@
-# ChangeLog for x11-misc/wmtz
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.1 2002/10/24 19:12:24 raker Exp $
+# ChangeLog for x11-plugins/wmtz
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
+
+  13 Nov 2005; Daniel Goller <morfic@gentoo.org> wmtz-0.7.ebuild:
+  Removing condition for patch, so gcc4 can compile this too
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmtz-0.7.ebuild:
+  Removed COPYING and INSTALL from dodoc.
+
+  16 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmtz-0.7.ebuild:
+  Inherit 'toolchain-funcs' instead of 'gcc', as per bug #92745.
+  Make package honour Gentoo CFLAGS...
+
+  25 Nov 2004; Jason Wever <weeve@gentoo.org> wmtz-0.7.ebuild:
+  Added ~sparc keyword.
+
+  18 Sep 2004; Daniel Goller <morfic@gentoo.org> +files/wmtz-0.7-gcc34.patch,
+  wmtz-0.7.ebuild:
+  applying Magnade's gcc3.4 patch to close bug #64556
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmtz-0.7.ebuild:
+  Masked wmtz-0.7.ebuild stable for ppc
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmtz-0.7.ebuild:
+  Inherit eutils for epatch.
+
+  07 Apr 2004; Markus Nigbur <pyrania@gentoo.org> wmtz-0.7.ebuild,
+  files/wmtz.c.patch:
+  Fixed syntax error in wmtz.c file. Closing bug #47076.
 
 *wmtz-0.7 (4-Aug-2002)
 
+  17 Jan 2003; Seemant Kulleen <seemant@gentoo.org> wmtz-0.7.ebuild :
+
+  Put the config file in /etc as a default.  Also, removed WindowMaker as a
+  DEPEND, since it's spurious.
+
   24 Oct 2002; Nick Hadaway <raker@gentoo.org>
   Added to portage.  Made some minor changes to the initial ebuild.
 
diff --git a/x11-plugins/wmtz/Manifest b/x11-plugins/wmtz/Manifest
index e69de29bb2d1..a0723877ce4d 100644
--- a/x11-plugins/wmtz/Manifest
+++ b/x11-plugins/wmtz/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 54929baf79793e54f538e4c20495d95e ChangeLog 1650
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 a70cf080daa7c0c960b276f6ba41643d wmtz-0.7.ebuild 854
+MD5 6efb0655a3f8a17ecd56106d4d39ebda files/digest-wmtz-0.7 59
+MD5 f44970f0cb57d7fca808329d20d45902 files/wmtz-0.7-gcc34.patch 336
+MD5 87d237cba796423d80d030a210401ed0 files/wmtz.c.patch 465
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdujl/aM9DdBw91cRAqTfAJ46r8rhLSbwxiKnZYpypDPdKoT0wQCcCHps
+mTB7LBbfDqBD79jTXAD+Gpg=
+=DtG6
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmtz/metadata.xml b/x11-plugins/wmtz/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmtz/metadata.xml
+++ b/x11-plugins/wmtz/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmtz/wmtz-0.7.ebuild b/x11-plugins/wmtz/wmtz-0.7.ebuild
index 7f416f2d45bf..f859de2b8608 100644
--- a/x11-plugins/wmtz/wmtz-0.7.ebuild
+++ b/x11-plugins/wmtz/wmtz-0.7.ebuild
@@ -1,32 +1,37 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/wmtz-0.7.ebuild,v 1.1 2002/10/24 19:12:24 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/wmtz-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
+inherit eutils toolchain-funcs
 
+IUSE=""
 DESCRIPTION="dockapp that shows the time in multiple timezones."
 SRC_URI="http://www.geocities.com/jl1n/wmtz/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/jl1n/wmtz/wmtz.html"
 
-DEPEND="virtual/x11 x11-wm/WindowMaker virtual/glibc"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ppc ~sparc"
 
-IUSE=""
+DEPEND="virtual/x11"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	cd ${S}/wmtz
-	emake CFLAGS="$CFLAGS"  || die
+	#apply both patches to compile with gcc-3.4 closing bug #64556
+		epatch ${FILESDIR}/wmtz-0.7-gcc34.patch
+}
 
+src_compile() {
+	cd ${S}/wmtz
+	epatch ${FILESDIR}/wmtz.c.patch
+	emake FLAGS="$CFLAGS" || die
 }
 
 src_install () {
-
 	dobin wmtz/wmtz
-
-	dodoc BUGS CHANGES COPYING README INSTALL wmtz/wmtzrc
-
+	insinto /etc
+	doins wmtz/wmtzrc
+	dodoc BUGS CHANGES README
 }
diff --git a/x11-plugins/wmufo/ChangeLog b/x11-plugins/wmufo/ChangeLog
index 35865c340013..df1b15d80f3e 100644
--- a/x11-plugins/wmufo/ChangeLog
+++ b/x11-plugins/wmufo/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-plugins/wmufo
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmufo/ChangeLog,v 1.1 2004/06/22 19:57:59 s4t4n Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmufo/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmufo-1.2.0.ebuild:
+  Removed INSTALL from dodoc.
+
+  02 Mar 2005; Michele Noberasco <s4t4n@gentoo.org> wmufo-1.2.0.ebuild:
+  Added dependancy on gnome-base/libgtop, closing #83681.
+
+  25 Nov 2004; Jason Wever <weeve@gentoo.org> wmufo-1.2.0.ebuild:
+  Added ~sparc keyword.
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmufo-1.2.0.ebuild:
+  Stable for x86.
 
 *wmufo-1.2.0 (22 Jun 2004)
 
diff --git a/x11-plugins/wmufo/Manifest b/x11-plugins/wmufo/Manifest
index 173322fec9a4..a79a01007447 100644
--- a/x11-plugins/wmufo/Manifest
+++ b/x11-plugins/wmufo/Manifest
@@ -1,4 +1,4 @@
-MD5 700a4bddbd8a9e4d098941a3e894c779 wmufo-1.2.0.ebuild 635
-MD5 e1934b45eb4cc3c4c663f538c6e68e5d ChangeLog 264
+MD5 e052e21587fbab4e052814b696fd8e1e wmufo-1.2.0.ebuild 750
+MD5 879589310fe61d0278a70b132abd1b52 ChangeLog 760
 MD5 e86f4df9f6772e76269a4967b5bb79f8 metadata.xml 326
 MD5 530428a46337b4a35c20062e287df457 files/digest-wmufo-1.2.0 63
diff --git a/x11-plugins/wmufo/wmufo-1.2.0.ebuild b/x11-plugins/wmufo/wmufo-1.2.0.ebuild
index bcf1bc6f48f5..c45a1fbf9ea6 100644
--- a/x11-plugins/wmufo/wmufo-1.2.0.ebuild
+++ b/x11-plugins/wmufo/wmufo-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmufo/wmufo-1.2.0.ebuild,v 1.1 2004/06/22 19:57:59 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmufo/wmufo-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 inherit eutils
 
@@ -12,15 +12,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://wmseti.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc"
 LICENSE="GPL-2"
 
 DEPEND="virtual/x11
 	>=dev-util/pkgconfig-0.15.0
-	>=x11-libs/gtk+-2.2.4-r1"
+	>=x11-libs/gtk+-2.2.4-r1
+	>=gnome-base/libgtop-2.8.1"
 
 src_install () {
 	einstall || die "make install failed"
 
-	dodoc AUTHORS ALL_I_GET_IS_AN_ALIEN_FACE ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ALL_I_GET_IS_AN_ALIEN_FACE ChangeLog NEWS README
 }
diff --git a/x11-plugins/wmupmon/ChangeLog b/x11-plugins/wmupmon/ChangeLog
index 282aa6400181..954fcce70f2a 100644
--- a/x11-plugins/wmupmon/ChangeLog
+++ b/x11-plugins/wmupmon/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for x11-plugins/wmupmon
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/ChangeLog,v 1.1 2003/06/06 22:52:39 robh Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
+
+  11 Nov 2005; Michele Noebrasco <s4t4n@gentoo.org> wmupmon-0.1.2.ebuild:
+  Removed INSTALL and COPYING from dodoc.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> wmupmon-0.1.2.ebuild:
+  stable on ppc64, bug #62259
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmupmon-0.1.2.ebuild:
+  Masked wmupmon-0.1.2.ebuild stable for ppc
+
+  02 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmupmon-0.1.2.ebuild:
+  Ebuild clean up, stable on x86.
+  wmupmon-0.1.1a.ebuild:
+  Wipe out older version.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmupmon-0.1.2.ebuild:
+  Stable on amd64, remvoving S=.
+
+*wmupmon-0.1.2 (13 Mar 2004)
+
+  13 Mar 2004; Markus Nigbur <pyrania@gentoo.org> wmupmon-0.1.1a.ebuild,
+  wmupmon-0.1.2.ebuild:
+  Version bump. Closing bug #44484.
+
+  24 Sep 2003; Jason Wever <weeve@gentoo.org> wmupmon-0.1.1a.ebuild:
+  Added ~sparc keyword.
+
+  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org> wmupmon-0.1.1a.ebuild:
+  xpm is provided by xfree
 
 *wmupmon-0.1.1a (06 Jun 2003)
 
diff --git a/x11-plugins/wmupmon/Manifest b/x11-plugins/wmupmon/Manifest
index 9d5f0f1a0d7b..e290be8f899b 100644
--- a/x11-plugins/wmupmon/Manifest
+++ b/x11-plugins/wmupmon/Manifest
@@ -1,3 +1,4 @@
-MD5 6ddcab1ca9ce984bc88890936eddd753 ChangeLog 377
-MD5 da941551beadd084deaa1dd8303f3430 wmupmon-0.1.1a.ebuild 826
-MD5 b610db91de3c6cdf44fa50701b321445 files/digest-wmupmon-0.1.1a 67
+MD5 24ab95fbd567d3a1e558eb2d8cf47534 wmupmon-0.1.2.ebuild 720
+MD5 327ef5b7ffcafea777c868dd143894ab ChangeLog 1427
+MD5 95e861c19d822659f3a0a7a8ea92c5c2 metadata.xml 321
+MD5 59b42bc2638f2283a42a84ea40ae76e7 files/digest-wmupmon-0.1.2 66
diff --git a/x11-plugins/wmupmon/metadata.xml b/x11-plugins/wmupmon/metadata.xml
index 84616f72f08d..e81ee43ab735 100644
--- a/x11-plugins/wmupmon/metadata.xml
+++ b/x11-plugins/wmupmon/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild b/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild
index 0f788f7a83ae..d44ed42eb050 100644
--- a/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild
+++ b/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild
@@ -1,34 +1,26 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild,v 1.1 2004/03/13 22:59:35 pyrania Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmupmon/wmupmon-0.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:37 chriswhite Exp $
 
 DESCRIPTION="wmUpMon is a program to monitor your Uptime"
 HOMEPAGE="http://j-z-s.com/projects/index.php?project=wmupmon"
 SRC_URI="http://j-z-s.com/projects/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
-
+KEYWORDS="x86 ~sparc amd64 ppc ppc64"
 IUSE=""
-
 DEPEND="sys-devel/automake
 	sys-devel/autoconf
 	virtual/x11"
 
-
-src_compile() {
-
-	# This is needed specifically for depcomp, which is necessary for
-	# building wmupmon, but isn't included -- Is there a better way?
-	#cp ${FILESDIR}/depcomp .
+src_compile()
+{
 	econf || die "configure failed"
-
-	emake  || die "parallel make failed"
+	emake || die "parallel make failed"
 }
 
-src_install() {
+src_install()
+{
 	einstall || die "make install failed"
-	dodoc AUTHORS COPYING INSTALL README THANKS ChangeLog
+	dodoc AUTHORS README THANKS ChangeLog
 }
diff --git a/x11-plugins/wmusic/ChangeLog b/x11-plugins/wmusic/ChangeLog
index 45c534f504f7..968cfc6e9e56 100644
--- a/x11-plugins/wmusic/ChangeLog
+++ b/x11-plugins/wmusic/ChangeLog
@@ -1,9 +1,40 @@
 # ChangeLog for x11-plugins/wmusic
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/ChangeLog,v 1.1 2003/01/14 06:35:55 raker Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  25 Nov 2004; Jason Wever <weeve@gentoo.org> wmusic-1.5.0.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmusic-1.5.0.ebuild:
+  Stable on amd64.
+
+  06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmusic-1.5.0.ebuild:
+  Stable for x86.
+
+*wmusic-1.5.0 (24 Jul 2004)
+
+  24 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmusic-1.5.0.ebuild:
+  Version bump.
+  wmusic-1.4.11.ebuild:
+  Stable on x86
+  wmusic-1.4.10.ebuild:
+  Wipe out old ebuild.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmusic-1.4.10.ebuild,
+  wmusic-1.4.11.ebuild:
+  glibc -> libc, add sed-4 dep
+
+*wmusic-1.4.11 (14 Aug 2003)
+
+  14 Aug 2003; Nick Hadaway <raker@gentoo.org> wmusic-1.4.11.ebuild:
+  Version bump.  Closes bug #26307.  This version adds support for
+  volume control without a scroll mouse.
 
 *wmusic-1.4.10 (14 Jan 2003)
 
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> wmusic-1.4.10.ebuild :
+  Removed dependancy on WindowMaker
+
   14 Jan 2003; Nick Hadaway <raker@gentoo.org> wmusic-1.4.10.ebuild,
   files/digest-wmusic-1.4.10 :
   New ebuild.  xmms-controlling dockapp.
diff --git a/x11-plugins/wmusic/Manifest b/x11-plugins/wmusic/Manifest
index e69de29bb2d1..a07ff93ff30d 100644
--- a/x11-plugins/wmusic/Manifest
+++ b/x11-plugins/wmusic/Manifest
@@ -0,0 +1,6 @@
+MD5 624f76bd28f07c5d183da22cfa284bd4 ChangeLog 1305
+MD5 7eef6e015727ac235d78fa51635b34db metadata.xml 394
+MD5 3d091f539b0c782f792b24312c115d0f wmusic-1.4.11.ebuild 693
+MD5 63e0f108b90c17abb8af5da5d198b1c5 wmusic-1.5.0.ebuild 682
+MD5 abad3aa3b6329da8ba2feee1fe9b2a1e files/digest-wmusic-1.5.0 63
+MD5 c94be60d3c8d8276495ea62f69119612 files/digest-wmusic-1.4.11 68
diff --git a/x11-plugins/wmusic/metadata.xml b/x11-plugins/wmusic/metadata.xml
index 12a0a6193a2f..f7e2d5eb2912 100644
--- a/x11-plugins/wmusic/metadata.xml
+++ b/x11-plugins/wmusic/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmusic/wmusic-1.4.11.ebuild b/x11-plugins/wmusic/wmusic-1.4.11.ebuild
index 391ebfcd7d70..1e13164e8414 100644
--- a/x11-plugins/wmusic/wmusic-1.4.11.ebuild
+++ b/x11-plugins/wmusic/wmusic-1.4.11.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # 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.1 2003/08/14 20:55:38 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/wmusic-1.4.11.ebuild,v 1.1.1.1 2005/11/30 10:10:40 chriswhite Exp $
 
 DESCRIPTION="dockapp for xmms"
 HOMEPAGE="http://home.jtan.com/~john/wmusic/"
 SRC_URI="http://home.jtan.com/~john/wmusic/downloads/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
-	>media-sound/xmms-1.2.4"
-
-S=${WORKDIR}/${P}
+	>media-sound/xmms-1.2.4
+	>=sys-apps/sed-4"
 
 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.5.0.ebuild b/x11-plugins/wmusic/wmusic-1.5.0.ebuild
index 87bc8761ec17..c5f7b0f4e341 100644
--- a/x11-plugins/wmusic/wmusic-1.5.0.ebuild
+++ b/x11-plugins/wmusic/wmusic-1.5.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/wmusic-1.5.0.ebuild,v 1.1 2004/07/24 10:54:28 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmusic/wmusic-1.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
 DESCRIPTION="dockapp for xmms"
 HOMEPAGE="http://home.jtan.com/~john/wmusic/"
 SRC_URI="http://home.jtan.com/~john/wmusic/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
 IUSE=""
 DEPEND="virtual/libc
 	virtual/x11
diff --git a/x11-plugins/wmwave/ChangeLog b/x11-plugins/wmwave/ChangeLog
index 08d0fe163784..3eafbbc07c66 100644
--- a/x11-plugins/wmwave/ChangeLog
+++ b/x11-plugins/wmwave/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-plugins/wmwave
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwave/ChangeLog,v 1.1 2003/12/14 05:07:08 pylon Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwave/ChangeLog,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmwave-0.4.ebuild:
+  removed COPYING from dodoc.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmwave-0.4.ebuild:
+  Masked wmwave-0.4.ebuild stable for ppc
+
+  02 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmwave-0.4.ebuild:
+  Stable for x86.
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmwave-0.4.ebuild:
+  Gave ebuild a good clean up: updated HOMEPAGE and SRC_URI, make it
+  honour Gentoo USE flags, add "virtual/X11" dependency, update
+  DESCRIPTION.
+  metadata.xml:
+  Assign this to the desktop-dock herd.
 
 *wmwave-0.4 (14 Dec 2003)
 
diff --git a/x11-plugins/wmwave/Manifest b/x11-plugins/wmwave/Manifest
index a749b5f4ec77..f89d55f6126e 100644
--- a/x11-plugins/wmwave/Manifest
+++ b/x11-plugins/wmwave/Manifest
@@ -1,4 +1,4 @@
-MD5 8f76b492c2962263ee85adab91947ede wmwave-0.4.ebuild 609
-MD5 01bdba6b03d3b770ac308c9e0a7f8478 metadata.xml 282
-MD5 2a24171715d48351507a69d0c70de666 ChangeLog 309
+MD5 1d4654e0633759308f561219a45913d7 wmwave-0.4.ebuild 660
+MD5 cba0e12c7f22d7a615e2045eefd25d07 ChangeLog 979
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 da96af71b917898e90f435be0669601e files/digest-wmwave-0.4 58
diff --git a/x11-plugins/wmwave/metadata.xml b/x11-plugins/wmwave/metadata.xml
index a3d026bea9da..b1a9efc4f2f0 100644
--- a/x11-plugins/wmwave/metadata.xml
+++ b/x11-plugins/wmwave/metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>fd@noxa.de</email>
-  <name>Florian Daniel</name>
-  <description>Testing</description>
-</maintainer>
+<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/wmwave/wmwave-0.4.ebuild b/x11-plugins/wmwave/wmwave-0.4.ebuild
index f05c45fd6a47..f04488006818 100644
--- a/x11-plugins/wmwave/wmwave-0.4.ebuild
+++ b/x11-plugins/wmwave/wmwave-0.4.ebuild
@@ -1,27 +1,23 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwave/wmwave-0.4.ebuild,v 1.1 2003/12/14 05:07:08 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwave/wmwave-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:50 chriswhite Exp $
 
+IUSE=""
 S="${WORKDIR}/wmwave"
-KEYWORDS="~ppc ~x86"
-DESCRIPTION="wmwave is a windom manager dockapp which displays the quality, link, level and noise of an iee802.11 (wavelan) link."
-SRC_URI="http://www.schuermann.org/~dockapps/dist/wmwave-0-4.tgz"
-HOMEPAGE="http://www.schuermann.org/~dockapps"
+KEYWORDS="ppc x86"
+DESCRIPTION="wmwave is a dockapp that displays quality, link, level and noise of an iee802.11 (wavelan) connection."
+SRC_URI="mirror://sourceforge/wmwave/${PN}-0-4.tgz"
+HOMEPAGE="http://wmwave.sourceforge.net/"
 LICENSE="GPL-2"
-DEPEND=""
+DEPEND="virtual/x11"
 SLOT="0"
 
-src_unpack() {
-	unpack "wmwave-0-4.tgz"
-	cd "${S}"
-}
-
 src_compile() {
-	emake || die
+	emake FLAGS="${CFLAGS}" || die "Compilation failed"
 }
 
 src_install () {
 	dobin wmwave
 	doman wmwave.1
-	dodoc COPYING README
+	dodoc README
 }
diff --git a/x11-plugins/wmweather+/ChangeLog b/x11-plugins/wmweather+/ChangeLog
index 8877a816dab2..89cd2ac32411 100644
--- a/x11-plugins/wmweather+/ChangeLog
+++ b/x11-plugins/wmweather+/ChangeLog
@@ -1,9 +1,69 @@
 # ChangeLog for x11-plugins/wmweather+
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/ChangeLog,v 1.1 2002/11/02 21:10:07 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/ChangeLog,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmweather+-2.9.ebuild:
+  Removed COPYING from dodoc.
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> wmweather+-2.9.ebuild:
+  Stable on ppc64
+
+  23 Dec 2004; Markus Rothe <corsair@gentoo.org> wmweather+-2.9.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #74851
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmweather+-2.9.ebuild:
+  Masked wmweather+-2.9.ebuild stable for ppc
+
+  17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmweather+-2.9.ebuild:
+  Stable on x86.
+  wmweather+-2.3.ebuild, wmweather+-2.5.ebuild:
+  Wiping out old ebuilds.
+
+  01 Jul 2004; David Holm <dholm@gentoo.org> wmweather+-2.9.ebuild:
+  Added to ~ppc.
+
+*wmweather+-2.9 (30 Jun 2004)
+
+  30 Jun 2004; Michele Noberasco <s4t4n@gentoo.org> wmweather+-2.9.ebuild:
+  Version bump.
+  wmweather+-2.9.ebuild:
+  Clean up old ebuilds...
+
+  12 May 2004; Daniel Ahlberg <aliz@gentoo.org> wmweather+-2.3.ebuild,
+  wmweather+-2.5.ebuild:
+  Removed S=.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> wmweather+-2.5.ebuild:
+  Added ~sparc keyword
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> wmweather+-2.5.ebuild:
+  Added ~mips keyword.
+
+*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)
+
+  02 Apr 2003; Spider <spider@gentoo.org> wmweather+-2.3.ebuild
+  fixing xpm dep, bug 1446
+  
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> wmweather+-2.3.ebuild,
+  files/digest-wmweather+-2.3 :
+  Version bump.
 
 *wmweather+-2.1 (02 Nov 2002)
 
+  02 Apr 2003; Spider <spider@gentoo.org> wmweather+-2.1.ebuild
+  fixing xpm dep, bug 1446
+
+  18 Jan 2003; Seemant Kulleen <seemant@gentoo.org> wmweather+-2.1.ebuild :
+
+  Added dev-libs/libpcre to DEPEND, closing bug #13964 by
+  eyez@infinite.fsw.leidenuniv.nl (Y-z)
+
   02 Nov 2002; Nick Hadaway <raker@gentoo.org> wmweather+-2.1.ebuild,
   files/digest-wmweather+-2.1 :
   New ebuild.  See bug #7768
diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest
index e69de29bb2d1..f18a6a0ad2d8 100644
--- a/x11-plugins/wmweather+/Manifest
+++ b/x11-plugins/wmweather+/Manifest
@@ -0,0 +1,4 @@
+MD5 5ca7532eb4a8ae9add1b023466c066e8 wmweather+-2.9.ebuild 682
+MD5 facb58d4bd535ed5349bd44b88e2d854 ChangeLog 2220
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 0f731bc97a9cb825e1a2e66cf95c08ba files/digest-wmweather+-2.9 66
diff --git a/x11-plugins/wmweather+/metadata.xml b/x11-plugins/wmweather+/metadata.xml
index f92079b5e391..b1a9efc4f2f0 100644
--- a/x11-plugins/wmweather+/metadata.xml
+++ b/x11-plugins/wmweather+/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmweather+/wmweather+-2.9.ebuild b/x11-plugins/wmweather+/wmweather+-2.9.ebuild
index 165c0f9d59ed..6d5e6307b7a9 100644
--- a/x11-plugins/wmweather+/wmweather+-2.9.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/wmweather+-2.9.ebuild,v 1.1 2004/06/30 08:11:41 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/wmweather+-2.9.ebuild,v 1.1.1.1 2005/11/30 10:10:53 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~mips ~sparc"
+KEYWORDS="x86 ~amd64 ~mips ~sparc ppc ppc64"
 
 DEPEND="x11-wm/windowmaker
 	dev-libs/libpcre
@@ -17,6 +17,6 @@ DEPEND="x11-wm/windowmaker
 
 src_install() {
 	dobin wmweather+
-	dodoc COPYING ChangeLog HINTS README example.conf
+	dodoc ChangeLog HINTS README example.conf
 	doman wmweather+.1
 }
diff --git a/x11-plugins/wmweather/ChangeLog b/x11-plugins/wmweather/ChangeLog
index 20a1b4de1177..402b3fa0e467 100644
--- a/x11-plugins/wmweather/ChangeLog
+++ b/x11-plugins/wmweather/ChangeLog
@@ -1,7 +1,44 @@
 # ChangeLog for x11-plugins/wmweather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/ChangeLog,v 1.1 2002/08/30 07:44:13 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> wmweather-2.4.0.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> wmweather-2.4.0.ebuild:
+  added ~ppc64 to KEYWORDS; bug #74833
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmweather-1.31-r1.ebuild:
+  Remove older version.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmweather-2.4.0.ebuild:
+  Masked wmweather-2.4.0.ebuild stable for ppc
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> wmweather-1.31-r1.ebuild,
+  wmweather-2.4.0.ebuild:
+  Typo in DESCRIPTION: applette -> applet. Bug 59717.
+
+  01 Jul 2004; David Holm <dholm@gentoo.org> wmweather-2.4.0.ebuild:
+  Added to ~ppc.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wmweather-2.4.0.ebuild:
+  Adding IUSE=
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> wmweather-2.4.0.ebuild:
+  Added ~mips keyword.
+
+  06 Jun 2003; Christian Birchinger <joker@gentoo.org> wmweather-2.4.0.ebuild:
+  Changed to stable keywords
+
+*wmweather-2.4.0 (28 May 2003)
+
+  28 May 2003; Christian Birchinger <joker@gentoo.org> wmweather-2.4.0.ebuild:
+  Totaly new version. Uses curl instead of external scripts.
+  This dockapp is not the same as wmweather+ 2.x.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *wmweather-1.31-r1 (25 Apr 2002)
 
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
diff --git a/x11-plugins/wmweather/Manifest b/x11-plugins/wmweather/Manifest
index e69de29bb2d1..172869945473 100644
--- a/x11-plugins/wmweather/Manifest
+++ b/x11-plugins/wmweather/Manifest
@@ -0,0 +1,4 @@
+MD5 54d4939763e9d0402bd46e899edc5877 ChangeLog 2131
+MD5 c6ec148ce1ce79964eeb127d646279df metadata.xml 540
+MD5 db73b1c50247fed688af213b3e61467b wmweather-2.4.0.ebuild 669
+MD5 07856e0234c60aadbaae76016dce5786 files/digest-wmweather-2.4.0 66
diff --git a/x11-plugins/wmweather/metadata.xml b/x11-plugins/wmweather/metadata.xml
index 26b75d003d1b..e695147fdfff 100644
--- a/x11-plugins/wmweather/metadata.xml
+++ b/x11-plugins/wmweather/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmweather/wmweather-2.4.0.ebuild b/x11-plugins/wmweather/wmweather-2.4.0.ebuild
index c76d83d1967f..9fa2de8353e8 100644
--- a/x11-plugins/wmweather/wmweather-2.4.0.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/wmweather-2.4.0.ebuild,v 1.1 2003/05/28 12:55:38 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/wmweather-2.4.0.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
-DESCRIPTION="Dockable applette for WindowMaker that shows weather."
-SRC_URI="http://www.godisch.de/debian/wmweather/${P}.tar.gz"
+IUSE=""
+DESCRIPTION="Dockable applet for WindowMaker that shows weather."
 HOMEPAGE="http://www.godisch.de/debian/wmweather/"
+SRC_URI="http://www.godisch.de/debian/wmweather/${P}.tar.gz"
 
-DEPEND="virtual/x11
-	net-ftp/curl"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+SLOT="0"
+KEYWORDS="x86 sparc amd64 ~mips ppc ppc64"
+
+DEPEND="virtual/x11
+	net-misc/curl"
 
 src_compile() {
 	cd ${S}/src
@@ -19,8 +20,8 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
+	dodoc CHANGES README
 	cd ${S}/src
 	make DESTDIR=${D} install || die
-	dodoc CHANGES COPYING README
 }
diff --git a/x11-plugins/wmwifi/ChangeLog b/x11-plugins/wmwifi/ChangeLog
index ee3ac1e1aaad..9ac8cdf024d9 100644
--- a/x11-plugins/wmwifi/ChangeLog
+++ b/x11-plugins/wmwifi/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for x11-plugins/wmwifi
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/ChangeLog,v 1.1 2004/02/01 02:10:37 rphillips Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/ChangeLog,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
+
+  07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmwifi-0.5.ebuild,
+  wmwifi-0.3.ebuild:
+  Removed RDEPEND as it was equal to DEPEND.
+
+*wmwifi-0.5 (04 Nov 2005)
+
+  04 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmwifi-0.5.ebuild:
+  Version bump.
+  metdata.xml:
+  Assigned to desktop-dock herd.
+
+  02 Oct 2005; Tom Martin <slarti@gentoo.org> wmwifi-0.3.ebuild:
+  Marked ~amd64.
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> wmwifi-0.3.ebuild:
+  Marked ppc stable for bug #97516.
+
+  28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> wmwifi-0.3.ebuild:
+  mark ~ppc
 
 *wmwifi-0.3 (31 Jan 2004)
 
diff --git a/x11-plugins/wmwifi/Manifest b/x11-plugins/wmwifi/Manifest
index 2462d3dfb107..6bc0d016ce1d 100644
--- a/x11-plugins/wmwifi/Manifest
+++ b/x11-plugins/wmwifi/Manifest
@@ -1,3 +1,6 @@
-MD5 4e2ac8254490220d2b7d10e8c8f3b8b2 .wmwifi-0.3.ebuild.swp 12288
-MD5 2a653dd839579ab4ca2741954fd21a6b wmwifi-0.3.ebuild 522
+MD5 3d5e7d279d2cebaf9fbd29cd6cb0c220 wmwifi-0.3.ebuild 704
+MD5 2ffa2ca328f7c2cb96af5e2c21576195 ChangeLog 890
+MD5 212ed62237ac39360ee07587bb804f68 wmwifi-0.5.ebuild 804
+MD5 5fb59ae4e503b4edd028ed8e0b09f2aa metadata.xml 230
 MD5 f827390bbdd272567d57e41743c1933d files/digest-wmwifi-0.3 62
+MD5 f50f814eee17cebb5de77d6c8f1940f1 files/digest-wmwifi-0.5 62
diff --git a/x11-plugins/wmwifi/metadata.xml b/x11-plugins/wmwifi/metadata.xml
index fc52d7ba53dd..7a8ba7719078 100644
--- a/x11-plugins/wmwifi/metadata.xml
+++ b/x11-plugins/wmwifi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>desktop-dock</herd>
 <maintainer>
   <email>rphillips@gentoo.org</email>
 </maintainer>
diff --git a/x11-plugins/wmwifi/wmwifi-0.3.ebuild b/x11-plugins/wmwifi/wmwifi-0.3.ebuild
index a6293979fed6..18e114e1d7eb 100644
--- a/x11-plugins/wmwifi/wmwifi-0.3.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-0.3.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/wmwifi-0.3.ebuild,v 1.1 2004/02/01 02:10:37 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/wmwifi-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
 IUSE=""
-
-S="${WORKDIR}/${P}"
 HOMEPAGE="http://wmwifi.digitalssg.net"
 DESCRIPTION="wireless network interface monitor dockapp"
 SRC_URI="http://digitalssg.net/debian/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="ppc x86 ~amd64"
 
 DEPEND="virtual/x11"
-RDEPEND="${DEPEND}"
 
 src_compile() {
 	myconf=""
diff --git a/x11-plugins/wmwifi/wmwifi-0.5.ebuild b/x11-plugins/wmwifi/wmwifi-0.5.ebuild
index 5289c750ab2c..b5cd86731bea 100644
--- a/x11-plugins/wmwifi/wmwifi-0.5.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/wmwifi-0.5.ebuild,v 1.1 2005/11/04 16:18:59 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/wmwifi-0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:41 chriswhite Exp $
 
 IUSE=""
 HOMEPAGE="http://wmwifi.digitalssg.net"
@@ -12,7 +12,6 @@ LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86 ~amd64"
 
 DEPEND="virtual/x11"
-RDEPEND="${DEPEND}"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmxkb/ChangeLog b/x11-plugins/wmxkb/ChangeLog
index dc6c70a6614e..2e7971427cf8 100644
--- a/x11-plugins/wmxkb/ChangeLog
+++ b/x11-plugins/wmxkb/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-plugins/wmxkb
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.1 2004/01/04 05:05:07 port001 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmxkb-1.2.2.ebuild:
+  Stable for x86.
+
+  16 Jun 2005; David Holm <dholm@gentoo.org> wmxkb-1.2.2.ebuild:
+  Added to ~ppc.
+
+*wmxkb-1.2.2 (15 Jun 2005)
+
+  15 Jun 2005; Markus Nigbur <pyrania@gentoo.org> +wmxkb-1.2.2.ebuild:
+  Version bump.
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> wmxkb-1.2.0.ebuild:
+  Marked stable.
 
 *wmxkb-1.2.0 (04 Jan 2004)
 
diff --git a/x11-plugins/wmxkb/Manifest b/x11-plugins/wmxkb/Manifest
index ca22ab2a5b10..f8d8923be698 100644
--- a/x11-plugins/wmxkb/Manifest
+++ b/x11-plugins/wmxkb/Manifest
@@ -1,2 +1,6 @@
-MD5 419c6b30c859bf6fcb7b71ad4c45de42 wmxkb-1.2.0.ebuild 586
+MD5 7404938a1499a3d7bfa1487154368def wmxkb-1.2.0.ebuild 677
+MD5 561791ca286761d1e073b389a6c908f3 wmxkb-1.2.2.ebuild 679
+MD5 677a9b1a8923891afba40d46c937e168 ChangeLog 705
+MD5 3926e20e1166bb22e2fa4c570adbff44 metadata.xml 173
 MD5 6a130f569c76b42786942f4b50b73082 files/digest-wmxkb-1.2.0 63
+MD5 a533fe57cfea3d25bb400d5f91ae1f60 files/digest-wmxkb-1.2.2 63
diff --git a/x11-plugins/wmxkb/metadata.xml b/x11-plugins/wmxkb/metadata.xml
index 2518313f5241..ebfeafcdb873 100644
--- a/x11-plugins/wmxkb/metadata.xml
+++ b/x11-plugins/wmxkb/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+        <herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild
index e50d601c64bb..5499c58b020a 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild,v 1.1 2004/01/04 05:05:08 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.geocities.com/wmalms/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
index 18712156f815..ebcd3a0915b0 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.1 2005/06/15 09:07:57 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:47 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.geocities.com/wmalms/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~ppc ~sparc x86"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-plugins/wmxmms/ChangeLog b/x11-plugins/wmxmms/ChangeLog
index 543b847249e1..8cf09b3164d5 100644
--- a/x11-plugins/wmxmms/ChangeLog
+++ b/x11-plugins/wmxmms/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for x11-plugins/wmxmms
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.1 2003/09/15 12:27:35 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
+
+  19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  wmxmms-0.1.4-r1.ebuild:
+  Stable on hppa.
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Mark 0.1.4-r1 stable on alpha
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wmxmms-0.1.4-r1.ebuild:
+  Stable on ppc.
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Stable for x86.
+
+  10 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Updating middle-click patch, following feedback on bug #88280.
+
+*wmxmms-0.1.4-r1 (11 Apr 2005)
+
+  11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+  Revision, bump, adding patch to fix #88280.
+
+  02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  wmxmms-0.1.4.ebuild:
+  Masked wmxmms-0.1.4.ebuild stable for ppc
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> wmxmms-0.1.4.ebuild:
+  Fix bug #44407 by doing a make clean first.  Stable on x86.
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> wmxmms-0.1.4.ebuild:
+  Marking stable on hppa
 
 *wmxmms-0.1.4 (15 Sep 2003)
 
diff --git a/x11-plugins/wmxmms/Manifest b/x11-plugins/wmxmms/Manifest
index 6a1fbfcfcac2..53c38794bb2f 100644
--- a/x11-plugins/wmxmms/Manifest
+++ b/x11-plugins/wmxmms/Manifest
@@ -1,2 +1,7 @@
-MD5 52fff9cd5c726c7068af194d30b4d248 wmxmms-0.1.4.ebuild 596
+MD5 ace61d8e88ef94031a60eca1cdf799be ChangeLog 1492
+MD5 9162353667ec0175ad70c2ebd19dfd68 metadata.xml 373
+MD5 f2e9568ea8c859c3e87bbe9794ecafe6 wmxmms-0.1.4-r1.ebuild 866
+MD5 39afe28034765f9235b0932a69b6702b wmxmms-0.1.4.ebuild 778
 MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4 64
+MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4-r1 64
+MD5 c3b76c61cc652d22913743beced8b89b files/wmxmms-middle-click.patch 1354
diff --git a/x11-plugins/wmxmms/files/wmxmms-middle-click.patch b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
index ef452a49a6cd..5365e5de9c92 100644
--- a/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
+++ b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
@@ -1,7 +1,8 @@
+Common subdirectories: ../WMxmms-0.1.4.orig/src/.xvpics and src/.xvpics
 diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
---- ../WMxmms-0.1.4.orig/src/xmms_func.c	2005-03-21 11:51:47.375860272 -0700
-+++ src/xmms_func.c	2005-03-21 11:42:37.106513928 -0700
-@@ -113,17 +113,31 @@
+--- ../WMxmms-0.1.4.orig/src/xmms_func.c	2003-03-31 10:40:23.000000000 -0700
++++ src/xmms_func.c	2005-04-28 15:55:08.000000000 -0600
+@@ -110,17 +110,39 @@
  {
         char *command;
         int status;
@@ -24,12 +25,20 @@ diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
 -        }
 -       while (!xmms_remote_is_running(xmms_session))
 +
-+       while (!xmms_remote_is_running(xmms_session) && count < 30) {
++       while (!xmms_remote_is_running(xmms_session) && count < 1800) {
         		usleep(10000L);
 +		count++;
++		if( (count % 60) == 0 )
++		  {
++		    fprintf(stderr,
++			    "There may be a problem starting XMMS, or the "
++			    "XMMS remote is not running. Sleeping for 5 "
++			    "seconds and checking for the remote again.\n");
++		    sleep(5);
++		  }
 +       }
 +
-+       if( (count == 30) && status){
++       if( (count == 1800) && status){
 +      		fprintf(stderr, 
 +			"status(%d) XMMS can't be launched, exiting...\n",
 +			status);
@@ -39,6 +48,3 @@ diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
         free(command);
  }
  
-Only in ../WMxmms-0.1.4.orig/src: xmms_func.c.orig
-Only in src: .xmms_func.c.swp
-Common subdirectories: ../WMxmms-0.1.4.orig/src/.xvpics and src/.xvpics
diff --git a/x11-plugins/wmxmms/metadata.xml b/x11-plugins/wmxmms/metadata.xml
index 17bae13e535f..d24caa34a2f2 100644
--- a/x11-plugins/wmxmms/metadata.xml
+++ b/x11-plugins/wmxmms/metadata.xml
@@ -1,5 +1,3 @@
- [32;01m*[0m Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
index 1cd1a8246f7d..43c82fbaeea9 100644
--- a/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild,v 1.1 2005/04/11 08:52:04 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.dockapps.com/download.php/id/252/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="alpha ~amd64 hppa ppc ~sparc x86"
 
 DEPEND="virtual/x11
 	media-sound/xmms"
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
index d6ac3f3efc6d..bc2a1763473b 100644
--- a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild,v 1.1 2003/09/15 12:27:35 seemant Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:52 chriswhite Exp $
 
+IUSE=""
 MY_P=${P/wm/WM}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="WMaker DockApp: XMMS Control App"
@@ -11,11 +11,19 @@ SRC_URI="http://www.dockapps.com/download.php/id/252/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ppc ~sparc ~alpha hppa amd64"
 
 DEPEND="virtual/x11
 	media-sound/xmms"
 
+src_unpack() {
+	unpack ${A}
+
+	# Fix bug #44407
+	cd ${S}
+	make clean
+}
+
 src_compile() {
 	econf || die
 	emake OPT="${CFLAGS}" || die
diff --git a/x11-plugins/wmxres/ChangeLog b/x11-plugins/wmxres/ChangeLog
index 2202e0d4baf8..4ed3845ecadd 100644
--- a/x11-plugins/wmxres/ChangeLog
+++ b/x11-plugins/wmxres/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmxres
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.1 2004/08/26 22:27:09 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  04 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmxres-1.2.ebuild:
+  Stable on x86.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> wmxres-1.2.ebuild:
+  Added to ~ppc.
 
 *wmxres-1.2 (27 Aug 2004)
 
diff --git a/x11-plugins/wmxres/Manifest b/x11-plugins/wmxres/Manifest
index 921a9a21dd06..842f77f9fe2a 100644
--- a/x11-plugins/wmxres/Manifest
+++ b/x11-plugins/wmxres/Manifest
@@ -1,4 +1,6 @@
-MD5 092a4963173e0ca3d62aab1f2b25356a wmxres-1.2.ebuild 786
+MD5 e1d72787d99166fe6fe478e8928fcc24 wmxres-1.2.ebuild 828
+MD5 5c26f345c236ce219427f4a81200d769 ChangeLog 542
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 7faef3c2696850855d3c04cf2db18b0b files/wmxres-makefile.patch 445
 MD5 be65102309ba38b2fe3e2daab694b3af files/digest-wmxres-1.2 62
 MD5 ecbe1a6bd91322603485bc0ab1198599 files/wmxres.desktop 209
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
index 428474ed89a9..ebda43c6a0b4 100644
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.1 2004/08/26 22:27:09 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-1"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 S="${WORKDIR}/${PN}.app"
 
diff --git a/x11-plugins/wsoundserver/ChangeLog b/x11-plugins/wsoundserver/ChangeLog
index 433759977f5d..1b284a8b48c0 100644
--- a/x11-plugins/wsoundserver/ChangeLog
+++ b/x11-plugins/wsoundserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wsoundserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/ChangeLog,v 1.1 2005/06/15 09:26:09 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/ChangeLog,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
+
+  29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wsoundserver-0.4.1.ebuild:
+  Stable for x86.
+
+  16 Jun 2005; David Holm <dholm@gentoo.org> wsoundserver-0.4.1.ebuild:
+  Added to ~ppc.
 
 *wsoundserver-0.4.1 (15 Jun 2005)
 
diff --git a/x11-plugins/wsoundserver/Manifest b/x11-plugins/wsoundserver/Manifest
index 7d3f21aa1d6e..5c31fd82d9b5 100644
--- a/x11-plugins/wsoundserver/Manifest
+++ b/x11-plugins/wsoundserver/Manifest
@@ -1,5 +1,5 @@
-MD5 7e6097896ab8e8940bee2feaf5a4701c wsoundserver-0.4.1.ebuild 1168
-MD5 282389d60dfbe300ba2a932f2d0fa995 ChangeLog 277
+MD5 ba654dc41ce0d7dd2154b22495b19bd4 wsoundserver-0.4.1.ebuild 1283
+MD5 6c604cee80433a6d48e4e7929e25156f ChangeLog 560
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 70c168d98548414b9b90a83dbc13bdfe files/WSoundServer.xpm 12956
 MD5 327ba71e47dc0fbfdc91738e1ca2a70c files/digest-wsoundserver-0.4.1 74
diff --git a/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild b/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
index 9797ab5dca5b..f049904dba8d 100644
--- a/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
+++ b/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild,v 1.1 2005/06/15 09:26:09 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:43 chriswhite Exp $
 
 MY_P="${P/wsoundserver/WSoundServer}-new"
 S="${WORKDIR}/${MY_P}"
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 
 src_compile() {
 	local myconf="--prefix=/usr --with-x --sysconfdir=/etc/X11"
diff --git a/x11-plugins/yawmppp/ChangeLog b/x11-plugins/yawmppp/ChangeLog
index 50b4610be198..eecabb952c5b 100644
--- a/x11-plugins/yawmppp/ChangeLog
+++ b/x11-plugins/yawmppp/ChangeLog
@@ -1,9 +1,20 @@
-# ChangeLog for x11-misc/yawmppp
+# ChangeLog for x11-plugins/yawmppp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/yawmppp/ChangeLog,v 1.1 2005/07/04 10:06:07 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/yawmppp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+  11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> yawmppp-2.0.2.ebuild:
+  Removed INSTALL and COPYING from dodoc.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> yawmppp-2.0.2.ebuild:
+  Stable on ppc.
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> yawmppp-2.0.2.ebuild:
+  Added to ~ppc.
 
   04 Jul 2005; <s4t4n@gentoo.org> +yawmppp-2.0.2.ebuild:
   Moved from x11-misc/yawmppp to x11-plugins/yawmppp.
+  Added missing metadata.xml, assigned to desktop-dock herd.
+  Added patch to fix bug #95959.
 
   19 Jun 2004; <pyrania@gentoo.org> yawmppp-2.0.2.ebuild:
   Added ISUE, removed default .
diff --git a/x11-plugins/yawmppp/Manifest b/x11-plugins/yawmppp/Manifest
index 4458732d3298..d1bdd03dbb44 100644
--- a/x11-plugins/yawmppp/Manifest
+++ b/x11-plugins/yawmppp/Manifest
@@ -1,3 +1,5 @@
-MD5 2794262b1c1565613712acb275fa759e yawmppp-2.0.2.ebuild 974
-MD5 55d3a847b71bf2d218e59e1a66ad0ee5 ChangeLog 840
+MD5 da4fad416cc65fc65a88b3d65733b135 yawmppp-2.0.2.ebuild 1078
+MD5 1f289b2eaf4ee499577c1636531ed023 ChangeLog 1345
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 4e0fc569decd48ee323ab0a57d54b9a8 files/yawmppp-2.0.2-Makefile.in.patch 448
 MD5 5adde7571413fb3efb7ddde02602af74 files/digest-yawmppp-2.0.2 65
diff --git a/x11-plugins/yawmppp/yawmppp-2.0.2.ebuild b/x11-plugins/yawmppp/yawmppp-2.0.2.ebuild
index 847990206d9d..45fe5b93a64c 100644
--- a/x11-plugins/yawmppp/yawmppp-2.0.2.ebuild
+++ b/x11-plugins/yawmppp/yawmppp-2.0.2.ebuild
@@ -1,17 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/yawmppp/yawmppp-2.0.2.ebuild,v 1.1 2005/07/04 10:06:07 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/yawmppp/yawmppp-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:54 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Yet Another PPP Window Maker dock applet"
 SRC_URI="ftp://ftp.seul.org/pub/yawmppp/${P}.tar.gz"
 HOMEPAGE="http://yawmppp.seul.org/"
 DEPEND=">=net-dialup/ppp-2.3.11 =x11-libs/gtk+-1.2*"
-#RDEPEND=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc"
+KEYWORDS="ppc sparc x86"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src/dockapp
+
+	#Fix bug #95959
+	epatch ${FILESDIR}/${P}-Makefile.in.patch
+}
+
 src_compile() {
 	./configure \
 		--host=${CHOST} \
@@ -22,7 +31,7 @@ src_compile() {
 }
 
 src_install () {
-	dodoc README COPYING CHANGELOG INSTALL FAQ
+	dodoc README CHANGELOG FAQ
 
 	cd src
author	Chris White <chriswhite@gentoo.org>	2005-11-30 10:14:41 +0000
committer	Chris White <chriswhite@gentoo.org>	2005-11-30 10:14:41 +0000
commit	06b73af769fa91ca1e4183af479438603318049a (patch)
tree	6c0ad0d0b4cb2a0e7d5c38075f8cfc76a007e25b /x11-plugins
parent	(no commit message) (diff)
download	gentoo-2-import-1.1.1.tar.gz gentoo-2-import-1.1.1.tar.bz2 gentoo-2-import-1.1.1.zip